Changeset 3638 in vbox for trunk/include/VBox/com/defs.h

Timestamp:

Jul 16, 2007 1:13:59 PM (17 years ago)

Author:

vboxsync

Message:

AMD64 -> RT_ARCH_AMD64; X86 -> RT_ARCH_X86; [OS] -> RT_OS_[OS].

File:

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

trunk/include/VBox/com/defs.h

@@ -32 +32 @@
 #if !defined (VBOX_WITH_XPCOM)
 
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
 
 // Windows COM
@@ -72 +72 @@
 #define COM_IIDOF(I) _ATL_IIDOF (I)
 
-#else // defined (__WIN__)
+#else // defined (RT_OS_WINDOWS)
 
 #error "VBOX_WITH_XPCOM is not defined!"
 
-#endif // defined (__WIN__)
+#endif // defined (RT_OS_WINDOWS)
 
 #else // !defined (VBOX_WITH_XPCOM)
@@ -83 +83 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined (__OS2__)
+#if defined (RT_OS_OS2)
 
 /* Make sure OS/2 Toolkit headers are pulled in to have
@@ -96 +96 @@
 #undef TRUE
 
-#endif // defined (__OS2__)
-
-#if defined (__DARWIN__)
+#endif // defined (RT_OS_OS2)
+
+#if defined (RT_OS_DARWIN)
   /* CFBase.h defines these*/
 # undef FALSE
 # undef TRUE
-#endif  /* __DARWIN__ */
+#endif  /* RT_OS_DARWIN */
 
 #include <nsID.h>
@@ -284 +284 @@
 }
 
-#endif // !defined (__WIN__)
+#endif // !defined (RT_OS_WINDOWS)
 
 /**