Changeset 3191 in vbox for trunk/include/VBox

Timestamp:

Jun 20, 2007 10:26:49 PM (18 years ago)

Author:

vboxsync

Message:

Main: Made it build on OS/2.

File:

• trunk/include/VBox/com/defs.h (modified) (7 diffs)

trunk/include/VBox/com/defs.h

@@ -31 +31 @@
 #include <iprt/types.h>
 
+#if !defined (VBOX_WITH_XPCOM)
+
 #if defined (__WIN__)
 
@@ -44 +46 @@
 #define NS_IMPL_ISUPPORTS1_CI(a, b)
 
-// these are XPCOM only, one for every interface implemented
+/* these are XPCOM only, one for every interface implemented */
 #define NS_DECL_ISUPPORTS
 #define NS_DECL_IVIRTUALBOX
@@ -50 +52 @@
 #define NS_DECL_IMACHINE
 
-// input pointer argument to method
+/* input pointer argument to method */
 #define INPTR
 
-// makes the name of the getter interface function (n must be capitalized)
+/* makes the name of the getter interface function (n must be capitalized) */
 #define COMGETTER(n)    get_##n
-// makes the name of the setter interface function (n must be capitalized)
+/* makes the name of the setter interface function (n must be capitalized) */
 #define COMSETTER(n)    put_##n
 
-// a type for an input GUID parameter in the interface method declaration
+/* a type for an input GUID parameter in the interface method declaration */
 #define GUIDPARAM           GUID
-// a type for an output GUID parameter in the interface method declaration
+/* a type for an output GUID parameter in the interface method declaration */
 #define GUIDPARAMOUT        GUID*
 
@@ -71 +73 @@
 #define COM_IIDOF(I) _ATL_IIDOF (I)
 
-#else // !defined (__WIN__)
+#else // defined (__WIN__)
+
+#error "VBOX_WITH_XPCOM is not defined!"
+
+#endif // defined (__WIN__)
+
+#else // !defined (VBOX_WITH_XPCOM)
 
 // XPCOM
 /////////////////////////////////////////////////////////////////////////////
+
+#if defined (__OS2__)
+
+/* Make sure OS/2 Toolkit headers are pulled in to have
+ * BOOL/ULONG/etc. typedefs already defined in order to be able to redefine
+ * them using #define. */
+#include <os2.h>
+
+/* OS/2 Toolkit defines TRUE and FALSE */
+#undef FALSE
+#undef TRUE
+
+#endif // defined (__OS2__)
 
 #include <nsID.h>
@@ -112 +133 @@
 #define TRUE PR_TRUE
 
-// makes the name of the getter interface function (n must be capitalized)
+/* makes the name of the getter interface function (n must be capitalized) */
 #define COMGETTER(n)    Get##n
-// makes the name of the setter interface function (n must be capitalized)
+/* makes the name of the setter interface function (n must be capitalized) */
 #define COMSETTER(n)    Set##n
 
-// a type to define a raw GUID variable (better to use the Guid class)
+/* a type to define a raw GUID variable (better to use the Guid class) */
 #define GUID                nsID
-// a type for an input GUID parameter in the interface method declaration
+/* a type for an input GUID parameter in the interface method declaration */
 #define GUIDPARAM           nsID &
-// a type for an output GUID parameter in the interface method declaration
+/* a type for an output GUID parameter in the interface method declaration */
 #define GUIDPARAMOUT        nsID **
 
-// CLSID and IID for compatibility with Win32
+/* CLSID and IID for compatibility with Win32 */
 typedef nsCID   CLSID;
 typedef nsIID   IID;
 
-// OLE error codes
+/* OLE error codes */
 #define S_OK                NS_OK
 #define E_UNEXPECTED        NS_ERROR_UNEXPECTED
@@ -147 +168 @@
 #define COM_IIDOF(I) NS_GET_IID (I)
 
-// two very simple ATL emulator classes to provide
-// FinalConstruct()/FinalRelease() functionality on Linux
+/* two very simple ATL emulator classes to provide
+ * FinalConstruct()/FinalRelease() functionality on Linux */
 
 class CComObjectRootEx
@@ -163 +184 @@
 };
 
-// input pointer argument to method
+/* input pointer argument to method */
 #define INPTR const
 
-// helper functions
+/* helper functions */
 extern "C"
 {