diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-01-11 01:53:08 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-01-11 01:53:08 +0000 |
| commit | 9c7c505848e078ea281f84f5f05a542d8520448b (patch) | |
| tree | 629e389d349e08fadfbc0364827e4d0afa9f9b3f | |
| parent | dae93756ff1761ed8ee7c1dfdb64449078018a36 (diff) | |
| download | nspr-hg-9c7c505848e078ea281f84f5f05a542d8520448b.tar.gz | |
Bugzilla bug #23304: protypes.h should only test a macro defined in
prcpucfg.h (in this case, _aix32in6.cfg or _aix64.cfg).
Modified files: _aix32in6.cfg, _aix64.cfg, protypes.h
| -rw-r--r-- | pr/include/md/_aix32in6.cfg | 3 | ||||
| -rw-r--r-- | pr/include/md/_aix64.cfg | 3 | ||||
| -rw-r--r-- | pr/include/obsolete/protypes.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/pr/include/md/_aix32in6.cfg b/pr/include/md/_aix32in6.cfg index 05fe241f..bc9458c6 100644 --- a/pr/include/md/_aix32in6.cfg +++ b/pr/include/md/_aix32in6.cfg @@ -120,6 +120,9 @@ #define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 #define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 +/* used by protypes.h only */ +#define _PR_AIX_HAVE_BSD_INT_TYPES + #endif /* NO_NSPR_10_SUPPORT */ #endif /* nspr_cpucfg___ */ diff --git a/pr/include/md/_aix64.cfg b/pr/include/md/_aix64.cfg index 30ad04d9..b8e3e884 100644 --- a/pr/include/md/_aix64.cfg +++ b/pr/include/md/_aix64.cfg @@ -121,6 +121,9 @@ #define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 #define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 +/* used by protypes.h only */ +#define _PR_AIX_HAVE_BSD_INT_TYPES + #endif /* NO_NSPR_10_SUPPORT */ #endif /* nspr_cpucfg___ */ diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h index bcacbee5..9cc57dfb 100644 --- a/pr/include/obsolete/protypes.h +++ b/pr/include/obsolete/protypes.h @@ -70,8 +70,8 @@ typedef PRUint8 uint8; * So we don't define these four types here to avoid conflicts in case * the code also includes sys/types.h. */ -#if defined(AIX4_3) -#include <sys/inttypes.h> +#if defined(_PR_AIX_HAVE_BSD_INT_TYPES) +/* <sys/types.h> is already included */ #else typedef PRInt64 int64; @@ -89,7 +89,7 @@ typedef long int32; typedef PRInt16 int16; typedef PRInt8 int8; #endif /* HPUX */ -#endif /* AIX4_3 */ +#endif /* _PR_AIX_HAVE_BSD_INT_TYPES */ #endif /* XP_BEOS VMS */ |