diff options
| author | wtc%google.com <devnull@localhost> | 2009-06-13 13:07:39 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-06-13 13:07:39 +0000 |
| commit | 7ca454743d225c5c1593e3014a503cf7862560b9 (patch) | |
| tree | eca73144495f5f3db21d6e13ea6800bab13b867c | |
| parent | d15513d620c322b14f3bd1a0f8928a58b7e701f1 (diff) | |
| download | nspr-hg-7ca454743d225c5c1593e3014a503cf7862560b9.tar.gz | |
Bug 489231: The definitions of LL_ constants such as LL_MAXUINT in prlong.h
need to be kept in sync with the definitions of the PRInt64/PRUint64 types
in prtypes.h. The patch is contributed by Josh Aas <joshmoz@gmail.com>.
r=wtc.
Modified Files: prlong.h prtypes.h
Tag: NSPR_4_7_BRANCH
| -rw-r--r-- | pr/include/prlong.h | 3 | ||||
| -rw-r--r-- | pr/include/prtypes.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pr/include/prlong.h b/pr/include/prlong.h index 09b43217..42c5792e 100644 --- a/pr/include/prlong.h +++ b/pr/include/prlong.h @@ -77,7 +77,8 @@ NSPR_API(PRUint64) LL_MaxUint(void); #if defined(HAVE_LONG_LONG) -#if PR_BYTES_PER_LONG == 8 +/* Keep this in sync with prtypes.h. */ +#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) #define LL_MAXINT 9223372036854775807L #define LL_MININT (-LL_MAXINT - 1L) #define LL_ZERO 0L diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h index d71c05fc..67ee6082 100644 --- a/pr/include/prtypes.h +++ b/pr/include/prtypes.h @@ -387,6 +387,7 @@ typedef long PRInt32; ** the LL_ macros (see prlong.h). ************************************************************************/ #ifdef HAVE_LONG_LONG +/* Keep this in sync with prlong.h. */ /* * 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 |