3 files changed, 5 insertions, 16 deletions
diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h
index 92ccc6e60..467138946 100644
--- a/nsplugins/sdk/npapi.h
+++ b/nsplugins/sdk/npapi.h
@@ -50,7 +50,6 @@
 
 #include "prtypes.h"
 /* Copied from xp_core.h */
-/* removed #ifdef for hpux defined in /usr/include/model.h */
 #ifndef XP_MAC
 #ifndef _INT16
 #define _INT16
diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h
index 5d9190aa2..efd2a1509 100644
--- a/nsplugins/sdk/obsolete/protypes.h
+++ b/nsplugins/sdk/obsolete/protypes.h
@@ -82,11 +82,6 @@ typedef PRIntn intn;
 #include <sys/types.h>
 #endif
 
-/* model.h on HP-UX defines int8, int16, and int32. */
-#ifdef HPUX
-#include <model.h>
-#endif
-
 /*
  * uint
  */
@@ -146,8 +141,7 @@ typedef PRInt64 int64;
  */
 
 #if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
+    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
 #if !defined(WIN32) || !defined(_WINSOCK2API_)  /* defines its own "int32" */
 #if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
 typedef PRInt32 int32;
@@ -162,8 +156,7 @@ typedef long int32;
  */
 
 #if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
+    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
 typedef PRInt16 int16;
 #endif
 
@@ -172,8 +165,7 @@ typedef PRInt16 int16;
  */
 
 #if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
+    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
 typedef PRInt8 int8;
 #endif
 
diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h
index 842013ee8..29bad8018 100644
--- a/nsplugins/sdk/prtypes.h
+++ b/nsplugins/sdk/prtypes.h
@@ -266,10 +266,8 @@ typedef unsigned char PRUint8;
 ** For these compilers, we have to define PRInt8 as plain 'char'.
 ** Make sure that plain 'char' is indeed signed under these compilers.
 */
-#if (defined(HPUX) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus < 199707L) \
-    || (defined(SCO) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus == 1L)
+#if defined(SCO) && defined(__cplusplus) \
+        && !defined(__GNUC__) && __cplusplus == 1L
 typedef char PRInt8;
 #else
 typedef signed char PRInt8;