diff options
| author | wtc%google.com <devnull@localhost> | 2009-03-24 22:40:47 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-03-24 22:40:47 +0000 |
| commit | 2527801b47718f92798c7a36720be695ef11cd23 (patch) | |
| tree | 176d870e2e31cf1b5d73559db9fa3853ca4a5ebe | |
| parent | 85bdf4aa280f5528afa1ffa76046ba633cfefecd (diff) | |
| download | nspr-hg-2527801b47718f92798c7a36720be695ef11cd23.tar.gz | |
Bug 478687: Define PRUint64/uint64 as unsigned long long to match uint64_t
on Mac OS X (both 32-bit and 64-bit). r=joshmoz.
Tag: NSPR_4_7_BRANCH
| -rw-r--r-- | pr/include/prtypes.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h index 66814841..d71c05fc 100644 --- a/pr/include/prtypes.h +++ b/pr/include/prtypes.h @@ -387,7 +387,12 @@ typedef long PRInt32; ** the LL_ macros (see prlong.h). ************************************************************************/ #ifdef HAVE_LONG_LONG -#if PR_BYTES_PER_LONG == 8 +/* + * On 64-bit Mac OS X, uint64 needs to be defined as unsigned long long to + * match uint64_t, otherwise our uint64 typedef conflicts with the uint64 + * typedef in cssmconfig.h, which CoreServices.h includes indirectly. + */ +#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) typedef long PRInt64; typedef unsigned long PRUint64; #elif defined(WIN16) |