diff options
| -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) |