From 06b24f2bf761c086f56393a278048bacdd80bcdb Mon Sep 17 00:00:00 2001
From: "pollmann%netscape.com"
 <pollmann%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 12 Oct 2000 04:07:45 +0000
Subject: [PATCH] Fix AIX build bustage - these constants are already defined
 in system header files

git-svn-id: svn://10.0.0.236/trunk@80997 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/include/npapi.h                    | 7 ++++++-
 mozilla/modules/plugin/base/public/npapi.h | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h
index 923133e3f60..6bb7b3055ed 100644
--- a/mozilla/include/npapi.h
+++ b/mozilla/include/npapi.h
@@ -22,7 +22,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.9 $
+ *  npapi.h $Revision: 3.10 $
  *  Netscape client plug-in API spec
  */
 
@@ -155,6 +155,10 @@ typedef unsigned long uint32;
 #    endif /* __alpha */
 #endif
 
+/*
+ * AIX defines these in sys/inttypes.h included from sys/types.h
+ */
+#if defined(_PR_AIX_HAVE_BSD_INT_TYPES)
 #ifndef _INT16
 typedef short int16;
 #endif
@@ -166,6 +170,7 @@ typedef int int32;
 typedef long int32;
 #    endif /* __alpha */
 #endif
+#endif
 
 #ifndef FALSE
 #define FALSE (0)
diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h
index 923133e3f60..6bb7b3055ed 100644
--- a/mozilla/modules/plugin/base/public/npapi.h
+++ b/mozilla/modules/plugin/base/public/npapi.h
@@ -22,7 +22,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.9 $
+ *  npapi.h $Revision: 3.10 $
  *  Netscape client plug-in API spec
  */
 
@@ -155,6 +155,10 @@ typedef unsigned long uint32;
 #    endif /* __alpha */
 #endif
 
+/*
+ * AIX defines these in sys/inttypes.h included from sys/types.h
+ */
+#if defined(_PR_AIX_HAVE_BSD_INT_TYPES)
 #ifndef _INT16
 typedef short int16;
 #endif
@@ -166,6 +170,7 @@ typedef int int32;
 typedef long int32;
 #    endif /* __alpha */
 #endif
+#endif
 
 #ifndef FALSE
 #define FALSE (0)