Changeset 8194
- Timestamp:
- 04/19/08 23:02:49 (9 months ago)
- Files:
-
- trunk/include/VBox/com/defs.h (modified) (3 diffs)
- trunk/src/VBox/Runtime/r3/os2/mp-os2.cpp (modified) (1 diff)
- trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/VBox/com/defs.h
r8155 r8194 32 32 #define ___VBox_com_defs_h 33 33 34 /* 35 * Include iprt/types.h now to make sure iprt get to stdint.h first, 36 * otherwise a system/xpcom header might beat us and we'll be without 37 * the macros that are optional in C++. 38 */ 34 #if defined (RT_OS_OS2) 35 36 /* Make sure OS/2 Toolkit headers are pulled in to have BOOL/ULONG/etc. typedefs 37 * already defined in order to be able to redefine them using #define. It's 38 * also important to do it before iprt/cdefs.h, otherwise we'll lose RT_MAX in 39 * all code that uses COM Glue. */ 40 #define INCL_BASE 41 #define INCL_PM 42 #include <os2.h> 43 44 /* OS/2 Toolkit defines TRUE and FALSE */ 45 #undef FALSE 46 #undef TRUE 47 48 #endif /* defined (RT_OS_OS2) */ 49 50 /* Include iprt/types.h (which also includes iprt/types.h) now to make sure iprt 51 * get to stdint.h first, otherwise a system/xpcom header might beat us and 52 * we'll be without the macros that are optional in C++. */ 39 53 #include <iprt/types.h> 40 54 … … 48 62 #include <objbase.h> 49 63 #ifndef VBOX_COM_NO_ATL 50 # include <atlbase.h>64 # include <atlbase.h> 51 65 #endif 52 66 … … 163 177 // XPCOM 164 178 ///////////////////////////////////////////////////////////////////////////// 165 166 #if defined (RT_OS_OS2)167 168 /* Make sure OS/2 Toolkit headers are pulled in to have169 * BOOL/ULONG/etc. typedefs already defined in order to be able to redefine170 * them using #define. */171 #define INCL_BASE172 #define INCL_PM173 #include <os2.h>174 175 /* OS/2 Toolkit defines TRUE and FALSE */176 #undef FALSE177 #undef TRUE178 179 #endif /* defined (RT_OS_OS2) */180 179 181 180 #if defined (RT_OS_DARWIN) trunk/src/VBox/Runtime/r3/os2/mp-os2.cpp
r8170 r8194 96 96 97 97 98 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet) ;98 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet) 99 99 { 100 100 union trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp
r8170 r8194 240 240 { 241 241 if ( !pfnDestructor 242 || __libc_TLSDestructor(iTls, (void (*)(void *, int, unsigned))pfnDestructor, fFlags) != -1)242 || __libc_TLSDestructor(iTls, (void (*)(void *, int, unsigned))pfnDestructor, 0) != -1) 243 243 { 244 244 *piTls = iTls;
