From c62cc8b5d9e2f79ce957efd2863ca44c43e071ef Mon Sep 17 00:00:00 2001 From: "jdunn%netscape.com" Date: Wed, 22 May 2002 14:54:23 +0000 Subject: [PATCH] fixing plugins extensions for HP & AIX # 106806 r=serge@netscape.com,pkw@austin.ibm.com git-svn-id: svn://10.0.0.236/trunk@122023 18797224-902f-48f8-a5cc-f745e15eee43 --- .../modules/plugin/base/src/nsPluginsDirUnix.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp index c4c1cc13c13..db085a28f81 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp @@ -61,10 +61,14 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); #define LOCAL_PLUGIN_DLL_SUFFIX ".so" -#if defined(HPUX11) +#if defined(__hpux) #define DEFAULT_X11_PATH "/usr/lib/X11R6/" #undef LOCAL_PLUGIN_DLL_SUFFIX #define LOCAL_PLUGIN_DLL_SUFFIX ".sl" +#define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so" +#elif defined(_AIX) +#define DEFAULT_X11_PATH "/usr/lib" +#define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".a" #elif defined(SOLARIS) #define DEFAULT_X11_PATH "/usr/openwin/lib/" #elif defined(LINUX) @@ -252,6 +256,15 @@ PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec) if (n > 0 && !PL_strcmp(&pathname[n], LOCAL_PLUGIN_DLL_SUFFIX)) { ret = PR_TRUE; // *.so or *.sl file } +#ifdef LOCAL_PLUGIN_DLL_ALT_SUFFIX + if (PR_TRUE != ret) { + n = PL_strlen(pathname) - (sizeof(LOCAL_PLUGIN_DLL_ALT_SUFFIX) - 1); + if (n > 0 && !PL_strcmp(&pathname[n], LOCAL_PLUGIN_DLL_ALT_SUFFIX)) { + ret = PR_TRUE; + } + } +#endif + #ifdef NS_DEBUG printf("IsPluginFile(%s) == %s\n", pathname, ret?"TRUE":"FALSE"); #endif