Changeset 3191 in vbox for trunk/src/VBox/Main/VirtualBoxBase.cpp

Timestamp:

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

Author:

vboxsync

Message:

Main: Made it build on OS/2.

File:

• trunk/src/VBox/Main/VirtualBoxBase.cpp (modified) (6 diffs)

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -20 +20 @@
  */
 
+#if !defined (VBOX_WITH_XPCOM)
 #if defined (__WIN__)
 #include <windows.h>
 #include <dbghelp.h>
-#else // !defined (__WIN__)
+#endif
+#else // !defined (VBOX_WITH_XPCOM)
 #include <nsIServiceManager.h>
 #include <nsIExceptionService.h>
-#endif
+#endif // !defined (VBOX_WITH_XPCOM)
 
 #include "VirtualBoxBase.h"
@@ -507 +509 @@
     AssertReturn (aLock, (void) 0);
 
-#if defined(__LINUX__) && defined(__GNUC__)
+#if (defined(__LINUX__) || defined(__OS2__)) && defined(__GNUC__)
 
     RTCritSectEnterDebug (aLock,
@@ -570 +572 @@
     RTCritSectEnter (aLock);
 
-#endif // defined(__LINUX__)
+#endif // defined(__LINUX__)...
 }
 
@@ -671 +673 @@
         CheckComRCBreakRC (rc);
 
+#if !defined (VBOX_WITH_XPCOM)
 #if defined (__WIN__)
 
@@ -707 +710 @@
             rc = ::SetErrorInfo (0, err);
 
-#else // !defined (__WIN__)
+#endif
+#else // !defined (VBOX_WITH_XPCOM)
 
         nsCOMPtr <nsIExceptionService> es;
@@ -769 +773 @@
         }
 
-#endif // !defined (__WIN__)
+#endif // !defined (VBOX_WITH_XPCOM)
     }
     while (0);