Changeset 3638 in vbox for trunk/include/VBox/com

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22909

Message:

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

Location:

trunk/include/VBox/com

Files:

• EventQueue.h (modified) (2 diffs)
• Guid.h (modified) (2 diffs)
• VirtualBox.h (modified) (1 diff)
• defs.h (modified) (5 diffs)
• string.h (modified) (6 diffs)

trunk/include/VBox/com/EventQueue.h

@@ -23 +23 @@
 #define ___VBox_com_EventQueue_h
 
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
 #include <windows.h>
 #else
@@ -84 +84 @@
 private:
 
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
 
     DWORD mThreadId;

trunk/include/VBox/com/Guid.h

@@ -23 +23 @@
 #define ___VBox_com_Guid_h
 
-#if !defined (__WIN__)
+#if !defined (RT_OS_WINDOWS)
 #include <nsMemory.h>
 #endif
@@ -99 +99 @@
     operator const RTUUID * const () const { return &uuid; }
 
-#if defined(__WIN__)
+#if defined(RT_OS_WINDOWS)
 
     // to assign instances to GUIDPARAMOUT parameters from within the interface method

trunk/include/VBox/com/VirtualBox.h

@@ -37 +37 @@
 // generated VirtualBox COM library definition file
 #if !defined (VBOXCOM_NOINCLUDE)
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
 #include <VirtualBox.h>
 #else

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)
 
 /**

trunk/include/VBox/com/string.h

@@ -23 +23 @@
 #define ___VBox_com_string_h
 
-#if !defined(__WIN__)
+#if !defined(RT_OS_WINDOWS)
 #include <nsMemory.h>
 #endif
@@ -296 +296 @@
         if (str)
         {
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
             ::RTStrFree (str);
 #else
@@ -310 +310 @@
         if (str && *str == 0)
         {
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
             ::RTStrFree (str);
 #else
@@ -330 +330 @@
         if (aSize)
         {
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
             str = (char *) ::RTMemTmpAlloc (aSize);
 #else
@@ -426 +426 @@
     {
         if (rs)
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
             ::RTStrDupEx (&ls, rs);
 #else
@@ -437 +437 @@
         if (rs)
         {
-#if defined (__WIN__)
+#if defined (RT_OS_WINDOWS)
             ::RTStrUcs2ToUtf8 (&ls, (PRTUCS2) rs);
 #else