diff options
Diffstat (limited to 'nsplugins')
| -rw-r--r-- | nsplugins/sdk/npapi.h | 1 | ||||
| -rw-r--r-- | nsplugins/sdk/obsolete/protypes.h | 14 | ||||
| -rw-r--r-- | nsplugins/sdk/prtypes.h | 6 | ||||
| -rw-r--r-- | nsplugins/wrapper/wrapper.c | 30 |
4 files changed, 5 insertions, 46 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; diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c index 965868426..7caf645cb 100644 --- a/nsplugins/wrapper/wrapper.c +++ b/nsplugins/wrapper/wrapper.c @@ -4,11 +4,7 @@ #include <X11/Xlib.h> #include <X11/Xlibint.h> -#ifdef __hpux -#include <dl.h> -#else #include <dlfcn.h> -#endif #define XP_UNIX 1 #include "sdk/npupp.h" @@ -28,26 +24,13 @@ NP_Initialize_t *gNP_Initialize = NULL; NP_Shutdown_t *gNP_Shutdown = NULL; NP_GetValue_t *gNP_GetValue = NULL; -#ifdef __hpux -shl_t gLib; -#else void *gLib = 0L; -#endif FILE *ef = 0L; #define DEB fprintf static void UnloadPlugin() { -#ifdef __hpux - if (gLib) { - DEB( ef, "-> UnloadPlugin\n" ); - shl_unload(gLib); - DEB( ef, "<- UnloadPlugin\n" ); - - gLib=0L; - } -#else if ( gLib ) { DEB( ef, "-> UnloadPlugin\n" ); dlclose( gLib ); @@ -57,7 +40,6 @@ void UnloadPlugin() { if (ef) fclose( ef ); } -#endif } static @@ -70,17 +52,6 @@ void LoadPlugin() { setvbuf( ef, NULL, _IONBF, 0 ); DEB( ef, "-> LoadPlugin\n" ); -#ifdef __hpux - gLib = shl_load("/tmp/plugin.so", BIND_IMMEDIATE, 0L); - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_GetMIMEDescription)) - gNP_GetMIMEDescription = NULL; - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_Initialize)) - gNP_Initialize = NULL; - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_Shutdown)) - gNP_Shutdown = NULL; - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_GetValue)) - gNP_GetValue = NULL; -#else gLib = dlopen( "/tmp/plugin.so", RTLD_NOW ); DEB( ef, "gLib = %x\n", gLib ); @@ -88,7 +59,6 @@ void LoadPlugin() { gNP_Initialize = dlsym( gLib, "NP_Initialize" ); gNP_Shutdown = dlsym( gLib, "NP_Shutdown" ); gNP_GetValue = dlsym( gLib, "NP_GetValue" ); -#endif DEB( ef, "gNP_GetMIMEDescription = %x\n", NP_GetMIMEDescription ); DEB( ef, "gNP_Initialize = %x\n", gNP_Initialize ); DEB( ef, "gNP_Shutdown = %x\n", gNP_Shutdown ); |