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

Timestamp:

Oct 24, 2010 3:11:00 PM (14 years ago)

Author:

vboxsync

Message:

VBox/com/defs.h: Some OS/2 hack updates from a while back...

File:

• trunk/include/VBox/com/defs.h (modified) (1 diff)

trunk/include/VBox/com/defs.h

@@ -38 +38 @@
 #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
+# if defined(RT_MAX) && RT_MAX != 22
+#  undef RT_MAX
+#  define REDEFINE_RT_MAX
+# endif   
+# undef RT_MAX
 
 /* 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. It's
- * also important to do it before iprt/cdefs.h, otherwise we'll lose RT_MAX in
- * all code that uses COM Glue. */
-#define INCL_BASE
-#define INCL_PM
-#include <os2.h>
+ * already defined in order to be able to redefine them using #define. */
+# define INCL_BASE
+# define INCL_PM
+# include <os2.h>
 
 /* OS/2 Toolkit defines TRUE and FALSE */
-#undef FALSE
-#undef TRUE
+# undef FALSE
+# undef TRUE
+
+/* */
+# undef RT_MAX 
+# ifdef REDEFINE_RT_MAX
+#  define RT_MAX(Value1, Value2)                  ( (Value1) >= (Value2) ? (Value1) : (Value2) )
+# endif
 
 #endif /* defined (RT_OS_OS2) */