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

nsprpub/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___ */

nsprpub/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___ */

nsprpub/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 */