64-bit support for Mac OS X in base

base/basictypes.h

Index: base/basictypes.h
===================================================================
--- base/basictypes.h	(revision 78986)
+++ base/basictypes.h	(working copy)
@@ -27,9 +27,12 @@
 typedef int                 int32;
 #endif
 
-// The NSPR system headers define 64-bit as |long| when possible.  In order to
-// not have typedef mismatches, we do the same on LP64.
-#if __LP64__
+// The NSPR system headers define 64-bit as |long| when possible, except on
+// Mac OS X.  In order to not have typedef mismatches, we do the same on LP64.
+//
+// On Mac OS X, |long long| is used for 64-bit types for compatibility with
+// <inttypes.h> format macros even in the LP64 model.
+#if __LP64__ && !defined(OS_MACOSX)

[wtc, 2011/03/22 23:46:33]

Nit: it's better to test
    defined(__LP64__)
instead of
    __LP64__
here and at line 57 below.

Your changes match the following ifdef in NSPR's prtypes.h:
#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__)
typedef long PRInt64;
typedef unsigned long PRUint64;

http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/nsprpub/pr/include/prtype...

The best way to fix this mess is to compile Chromium code
that includes any NSPR/NSS public headers with -DNO_NSPR_10_SUPPORT.

Do you want to give that a try?

 typedef long                int64;
 #else
 typedef long long           int64;
@@ -51,7 +54,7 @@
 #endif
 
 // See the comment above about NSPR and 64-bit.
-#if __LP64__
+#if __LP64__ && !defined(OS_MACOSX)
 typedef unsigned long uint64;
 #else
 typedef unsigned long long uint64;