diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-30 19:10:17 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-30 19:10:17 +0100 |
| commit | e0fe19433aeb11e78009b178ab33d6197d7fad39 (patch) | |
| tree | 5399f1a5456fb395b3780bfce49b4b170bd634b8 /dom | |
| parent | ee91847c038fad5d155528a09e5c61e4eaf635f4 (diff) | |
| download | uxp-e0fe19433aeb11e78009b178ab33d6197d7fad39.tar.gz | |
Issue mcp-graveyard/UXP#187: Remove solaris conditional code.
Diffstat (limited to 'dom')
| -rw-r--r-- | dom/base/nsContentUtils.h | 4 | ||||
| -rw-r--r-- | dom/plugins/base/nsPluginsDirUnix.cpp | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 98df92efb0..299a8e8594 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -13,10 +13,6 @@ #include <float.h> #endif -#if defined(SOLARIS) -#include <ieeefp.h> -#endif - #include "js/TypeDecls.h" #include "js/Value.h" #include "js/RootingAPI.h" diff --git a/dom/plugins/base/nsPluginsDirUnix.cpp b/dom/plugins/base/nsPluginsDirUnix.cpp index 6d112b4fe0..1c7a635d37 100644 --- a/dom/plugins/base/nsPluginsDirUnix.cpp +++ b/dom/plugins/base/nsPluginsDirUnix.cpp @@ -27,8 +27,6 @@ #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) #define DEFAULT_X11_PATH "/usr/X11R6/lib/" #elif defined(__APPLE__) @@ -102,7 +100,7 @@ static bool LoadExtraSharedLib(const char *name, char **soname, bool tryToGetSon #define PLUGIN_MAX_NUMBER_OF_EXTRA_LIBS 32 #define PREF_PLUGINS_SONAME "plugin.soname.list" -#if defined(SOLARIS) || defined(HPUX) +#if defined(HPUX) #define DEFAULT_EXTRA_LIBS_LIST "libXt" LOCAL_PLUGIN_DLL_SUFFIX ":libXext" LOCAL_PLUGIN_DLL_SUFFIX ":libXm" LOCAL_PLUGIN_DLL_SUFFIX #else #define DEFAULT_EXTRA_LIBS_LIST "libXt" LOCAL_PLUGIN_DLL_SUFFIX ":libXext" LOCAL_PLUGIN_DLL_SUFFIX @@ -280,7 +278,7 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary **outLibrary) // work fine. -#if defined(SOLARIS) || defined(HPUX) +#if defined(HPUX) // Acrobat/libXm: Lazy resolving might cause crash later (bug 211587) *outLibrary = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW); pLibrary = *outLibrary; |