64-bit support for Mac OS X in base (NSPR)

base/third_party/nspr/prcpucfg_mac.h

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 26 matching lines @@
 
 #ifndef nspr_cpucfg___
 #define nspr_cpucfg___
 
 #ifndef XP_UNIX
 #define XP_UNIX
 #endif
 
 #define PR_AF_INET6 30  /* same as AF_INET6 */
 
-#if defined(i386)
+#ifdef __LITTLE_ENDIAN__
 #undef IS_BIG_ENDIAN
 #define  IS_LITTLE_ENDIAN 1
 #else
 #undef IS_LITTLE_ENDIAN
 #define  IS_BIG_ENDIAN 1
 #endif
 
+#if defined(__x86_64__)

[wtc, 2011/03/22 23:34:07]

Please use

#ifdef __x86_64__

to match the upstream file exactly.

+#define IS_64
+#endif
+
+#ifndef HAVE_LONG_LONG
 #define HAVE_LONG_LONG
+#endif
 #undef  HAVE_ALIGNED_DOUBLES
 #define HAVE_ALIGNED_LONGLONGS 1
 
+#ifdef IS_64
+
+#define PR_BYTES_PER_BYTE   1
+#define PR_BYTES_PER_SHORT  2
+#define PR_BYTES_PER_INT    4
+#define PR_BYTES_PER_INT64  8
+#define PR_BYTES_PER_LONG   8
+#define PR_BYTES_PER_FLOAT  4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD   8
+#define PR_BYTES_PER_DWORD  8
+
+#define PR_BITS_PER_BYTE    8
+#define PR_BITS_PER_SHORT   16
+#define PR_BITS_PER_INT     32
+#define PR_BITS_PER_INT64   64
+#define PR_BITS_PER_LONG    64
+#define PR_BITS_PER_FLOAT   32
+#define PR_BITS_PER_DOUBLE  64
+#define PR_BITS_PER_WORD    64
+#define PR_BITS_PER_DWORD   64
+
+#define PR_BITS_PER_BYTE_LOG2   3
+#define PR_BITS_PER_SHORT_LOG2  4
+#define PR_BITS_PER_INT_LOG2    5
+#define PR_BITS_PER_INT64_LOG2  6
+#define PR_BITS_PER_LONG_LOG2   6
+#define PR_BITS_PER_FLOAT_LOG2  5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2   6
+#define PR_BITS_PER_DWORD_LOG2  6
+
+#define PR_ALIGN_OF_SHORT   2
+#define PR_ALIGN_OF_INT     4
+#define PR_ALIGN_OF_LONG    8
+#define PR_ALIGN_OF_INT64   8
+#define PR_ALIGN_OF_FLOAT   4
+#define PR_ALIGN_OF_DOUBLE  8
+#define PR_ALIGN_OF_POINTER 8
+#define PR_ALIGN_OF_WORD    8
+#define PR_ALIGN_OF_DWORD   8
+
+#else /* IS_64 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
 #define PR_BYTES_PER_INT64  8
 #define PR_BYTES_PER_LONG   4
 #define PR_BYTES_PER_FLOAT  4
 #define PR_BYTES_PER_DOUBLE 8
 #define PR_BYTES_PER_WORD   4
 #define PR_BYTES_PER_DWORD  8
 #define PR_BYTES_PER_WORD_LOG2   2
@@ skipping 20 matching lines @@
 
 #define PR_ALIGN_OF_SHORT   2
 #define PR_ALIGN_OF_INT     4
 #define PR_ALIGN_OF_LONG    4
 #define PR_ALIGN_OF_INT64   4
 #define PR_ALIGN_OF_FLOAT   4
 #define PR_ALIGN_OF_DOUBLE  4
 #define PR_ALIGN_OF_POINTER 4
 #define PR_ALIGN_OF_WORD    4
 
+#endif /* IS_64 */
+
 #ifndef NO_NSPR_10_SUPPORT
 
 #define BYTES_PER_BYTE          PR_BYTES_PER_BYTE
 #define BYTES_PER_SHORT         PR_BYTES_PER_SHORT
 #define BYTES_PER_INT           PR_BYTES_PER_INT
 #define BYTES_PER_INT64         PR_BYTES_PER_INT64
 #define BYTES_PER_LONG          PR_BYTES_PER_LONG
 #define BYTES_PER_FLOAT         PR_BYTES_PER_FLOAT
 #define BYTES_PER_DOUBLE        PR_BYTES_PER_DOUBLE
 #define BYTES_PER_WORD          PR_BYTES_PER_WORD
@@ skipping 27 matching lines @@
 #define ALIGN_OF_WORD           PR_ALIGN_OF_WORD
 
 #define BYTES_PER_WORD_LOG2     PR_BYTES_PER_WORD_LOG2
 #define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
 #define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
 
 #endif /* NO_NSPR_10_SUPPORT */
 
 #endif /* nspr_cpucfg___ */