Index: base/third_party/nspr/prcpucfg_mac.h |
=================================================================== |
--- base/third_party/nspr/prcpucfg_mac.h (revision 78986) |
+++ base/third_party/nspr/prcpucfg_mac.h (working copy) |
@@ -44,7 +44,7 @@ |
#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 |
@@ -52,14 +52,64 @@ |
#define IS_BIG_ENDIAN 1 |
#endif |
+#ifdef __x86_64__ |
+#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 |
@@ -96,6 +146,8 @@ |
#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 |