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

Timestamp:

Nov 6, 2008 11:53:47 AM (16 years ago)

Author:

vboxsync

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

38915

Message:

Fixed include order, a bunch of GCC 3.3 warnings, OS/2 build.

Location:

trunk/include/VBox/com

Files:

• array.h (modified) (2 diffs)
• defs.h (modified) (1 diff)

trunk/include/VBox/com/array.h ¶

@@ -32 +32 @@
 #define ___VBox_com_array_h
 
-#include <VBox/com/ptr.h>
-
 /** @defgroup   grp_COM_arrays    COM/XPCOM Arrays
  * @{
@@ -168 +166 @@
 
 #if defined (VBOX_WITH_XPCOM)
-#include <nsMemory.h>
+# include <nsMemory.h>
 #endif
 
 #include "VBox/com/defs.h"
+#include "VBox/com/ptr.h"
 #include "VBox/com/assert.h"
 

trunk/include/VBox/com/defs.h ¶

@@ -41 +41 @@
 
 #if defined (RT_OS_OS2)
+
+#if defined(RT_MAX) && RT_MAX != 22
+# error RT_MAX already defined by <iprt/cdefs.h>! Make sure <VBox/com/defs.h> \
+        is included before it.
+#endif
 
 /* Make sure OS/2 Toolkit headers are pulled in to have BOOL/ULONG/etc. typedefs