Changeset 8448 for trunk/include


Ignore:
Timestamp:
May 17, 2002, 12:13:21 PM (23 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/OS2WIN.H

    r5369 r8448  
    2121#include "misc.h"
    2222
    23 #define OPEN32API       _System
    24 #define EXPENTRY_O32    _System
    25 #define APIENTRY_O32    _System
     23#define OPEN32API       SYSTEM
     24#define EXPENTRY_O32    SYSTEM
     25#define APIENTRY_O32    SYSTEM
    2626
    2727/* WinMain/WinProcs/TimerProcs
  • trunk/include/ccollection.h

    r7441 r8448  
    1 /* $Id: ccollection.h,v 1.9 2001-11-23 18:08:03 phaller Exp $ */
     1/* $Id: ccollection.h,v 1.10 2002-05-17 10:13:20 sandervl Exp $ */
    22
    33/*
     
    3232    public:
    3333        CCollection(int iInitialSize = 0);
    34         ~CCollection();
     34        virtual ~CCollection();
    3535
    3636        virtual void clear() = 0; // remove all elements from the table
     
    4949    public:
    5050        CIndexLookup(int iInitialSize = 0);
    51         ~CIndexLookup();
     51        virtual ~CIndexLookup();
    5252
    5353        void* addElement(int iIndex, void *pObject);
     
    8686        CIndexLookupLimit(int iHardLimitLow = 0,
    8787                          int iHardLimitHigh = 0);
    88         ~CIndexLookupLimit();
     88        virtual ~CIndexLookupLimit();
    8989
    9090
     
    113113    public:
    114114        CLinearList();
    115         ~CLinearList();
     115        virtual ~CLinearList();
    116116
    117117        PLINEARLISTENTRY addFirst  (void *pObject);
  • trunk/include/cpuhlp.h

    r6242 r8448  
    1 /* $Id: cpuhlp.h,v 1.6 2001-07-08 07:19:26 sandervl Exp $ */
     1/* $Id: cpuhlp.h,v 1.7 2002-05-17 10:13:20 sandervl Exp $ */
    22
    33#ifndef _CPUHLP_H_
     
    4343#define CONTROL87(a,b)  _control87(a, b)
    4444#else
     45#ifdef __WATCOMC__
     46#define CONTROL87(a,b)  _control87(a, b)
     47#else
    4548#error  CONTROL87 undefined
     49#endif
    4650#endif
    4751#endif
  • trunk/include/odin32.dbg.wat.mk

    r8426 r8448  
    1 # $Id: odin32.dbg.wat.mk,v 1.8 2002-05-16 12:13:35 sandervl Exp $
     1# $Id: odin32.dbg.wat.mk,v 1.9 2002-05-17 10:13:20 sandervl Exp $
    22
    33#
     
    7777DLLRTL = -br
    7878!endif
    79 CFLAGS           = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(DLLRTL)
    80 CXXFLAGS         = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd $(DLLRTL)
    81 CXXFLAGS_ODINCRT = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd
    82 CFLAGS_WIN32APP  = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
    83 CXXFLAGS_WIN32APP= -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
     79CFLAGS           = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(DLLRTL)
     80CXXFLAGS         = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd $(DLLRTL)
     81CXXFLAGS_ODINCRT = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd
     82CFLAGS_WIN32APP  = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
     83CXXFLAGS_WIN32APP= -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
    8484
    8585CINCLUDES        = -I$(%WATCOM)\h -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
  • trunk/include/odin32.dbg.watn.mk

    r7999 r8448  
    1 # $Id: odin32.dbg.watn.mk,v 1.2 2002-02-23 23:51:49 bird Exp $
     1# $Id: odin32.dbg.watn.mk,v 1.3 2002-05-17 10:13:20 sandervl Exp $
    22
    33#
     
    9292!endif
    9393
    94 CFLAGS           = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(CTARGET)   $(DLLRTL)
    95 CXXFLAGS         = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd $(CXXTARGET) $(DLLRTL)
    96 CXXFLAGS_ODINCRT = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd $(CXXTARGET)
    97 CFLAGS_WIN32APP  = -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(CTARGET)
    98 CXXFLAGS_WIN32APP= -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(CXXTARGET)
     94CFLAGS           = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(CTARGET)   $(DLLRTL)
     95CXXFLAGS         = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd $(CXXTARGET) $(DLLRTL)
     96CXXFLAGS_ODINCRT = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -xd $(CXXTARGET)
     97CFLAGS_WIN32APP  = -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(CTARGET)
     98CXXFLAGS_WIN32APP= -w4 -wcd=726 -wcd=14 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87     $(CXXTARGET)
    9999
    100100CINCLUDES        = -I$(WATCOM)\h -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
  • trunk/include/win32type.h

    r8345 r8448  
    13031303} MSLLHOOKSTRUCT, *LPMSLLHOOKSTRUCT, *PMSLLHOOKSTRUCT;
    13041304
    1305 #endif
     1305typedef BOOL (* CALLBACK ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG);
     1306typedef BOOL (* CALLBACK ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG);
     1307typedef BOOL (* CALLBACK ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG);
     1308typedef BOOL (* CALLBACK ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG);
     1309typedef BOOL (* CALLBACK ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG);
     1310typedef BOOL (* CALLBACK ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG);
     1311
     1312#endif
Note: See TracChangeset for help on using the changeset viewer.