Changeset 16398 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jan 30, 2009 12:39:56 AM (16 years ago)

Author:

vboxsync

Message:

protypes.h: Work around silly uint64 typedef clash.

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/include/obsolete/protypes.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/obsolete/protypes.h

@@ -106 +106 @@
  */
 
-#if !defined(XP_BEOS) && !defined(VMS)
+#if !defined(XP_BEOS) && !defined(VMS) \
+    && (!defined(__APPLE__) || !defined(_UINT64))
+/* bird: ^^^ cssmconfig.h conflicts on 10.6/amd64; XP_MACOSX isn't always set so check for the compiler. */
 typedef PRUint64 uint64;
+# if defined(__APPLE__) /* bird */
+#  define _UINT64       /* bird */
+# endif                 /* bird */
 #endif