Ticket #1: include.diff

\include/iprt/x86extra.mac

@@ -140 +140 @@
         .ds             resw 1
         .selLdt         resw 1
 endstruc
+%ifndef RT_OS_OS2
 AssertCompileSize(X86TSS16, 44)
+%endif
 
 
 struc X86TSS32
@@ -203 +205 @@
         .offIoBitmap    resw 1
         .IntRedirBitmap resb 32
 endstruc
+%ifndef RT_OS_OS2
 AssertCompileSize(X86TSS64, 136)
+%endif
 
 %endif
 

\include/VBox/com/defs.h

@@ -34 +34 @@
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#if defined (RT_OS_OS2)
+#if defined(RT_OS_OS2) && !defined(QT_CORE_LIB)
 
 # if defined(RT_MAX) && RT_MAX != 22
 #  undef RT_MAX
@@ -58 +58 @@
 #  define RT_MAX(Value1, Value2)                  ( (Value1) >= (Value2) ? (Value1) : (Value2) )
 # endif
 
+#else
+# include <qwindowdefs_pm.h>
 #endif /* defined(RT_OS_OS2) */
 
 /* Include iprt/types.h (which also includes iprt/types.h) now to make sure iprt

\include/VBox/sup.h

@@ -457 +457 @@
 #if defined(IN_SUP_R3) || defined(IN_SUP_R0)
 extern DECLEXPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
 
-#elif !defined(IN_RING0) || defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS)
+#elif !defined(IN_RING0) || defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_OS2)
 extern DECLIMPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
 
 #else /* IN_RING0 && !RT_OS_WINDOWS */

\include/VBox/vmm/hm_vmx.mac

@@ -175 +175 @@
     .uHostFSBase        resq    1
     .uHostGSBase        resq    1
 endstruc
+
+%ifndef RT_OS_OS2
+; // vs -- symbol referencies not supported in preprocess-only mode
 AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     16-2)
 AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     32-2)
 AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,    40)
 AssertCompileSize(VMXRESTOREHOST, 56)
-
+%endif