Changeset 8266 in vbox for trunk/include

Timestamp:

Apr 22, 2008 7:26:16 AM (17 years ago)

Author:

vboxsync

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

30011

Message:

Removed annoying warnings about existing defines if FE/Qt4 is compiled.

File:

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

trunk/include/VBox/com/defs.h

@@ -178 +178 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined (RT_OS_DARWIN)
-  /* CFBase.h defines these*/
+#if defined (RT_OS_DARWIN) || (defined (QT_VERSION) && (QT_VERSION >= 0x040000))
+  /* CFBase.h defines these & 
+   * qglobal.h from Qt4 defines these */
 # undef FALSE
 # undef TRUE
-#endif  /* RT_OS_DARWIN */
+#endif  /* RT_OS_DARWIN || QT_VERSION */
 
 #include <nsID.h>