summaryrefslogtreecommitdiffstats
path: root/dom/plugins/ipc/PluginMessageUtils.cpp
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2019-10-01 18:28:10 -0500
committerathenian200 <athenian200@outlook.com>2019-10-21 04:53:39 -0500
commit4105ebb6ed85aaffec5e4469a939945fb9eea066 (patch)
tree27c39693bf713900497c148fed1b9dc68c7ea4ba /dom/plugins/ipc/PluginMessageUtils.cpp
parent64e03d0149bed895d00e20e71da775e2aabf2f81 (diff)
downloadUXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar
UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar.gz
UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar.lz
UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.tar.xz
UXP-4105ebb6ed85aaffec5e4469a939945fb9eea066.zip
MoonchildProductions#1251 - Part 4: Core build system changes, lots of libevent/IPC junk.
This is mostly ifdefs, but as you can see, Solaris is actually a lot like Linux. They're both more SysV than BSD at core, and most of the differences have more to do with Solaris not using glibc than anything else. I still need to audit a lot of these changes and understand why they're needed and what the alternative approaches are. After this patch, most of the core functionality needed to build Solaris is here.
Diffstat (limited to 'dom/plugins/ipc/PluginMessageUtils.cpp')
-rw-r--r--dom/plugins/ipc/PluginMessageUtils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp
index 47653fe6e..5b1d1667f 100644
--- a/dom/plugins/ipc/PluginMessageUtils.cpp
+++ b/dom/plugins/ipc/PluginMessageUtils.cpp
@@ -82,7 +82,7 @@ MediateRace(const MessageChannel::MessageInfo& parent,
}
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_SOLARIS)
static string
ReplaceAll(const string& haystack, const string& needle, const string& with)
{
@@ -101,7 +101,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with)
string
MungePluginDsoPath(const string& path)
{
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_SOLARIS)
// https://bugzilla.mozilla.org/show_bug.cgi?id=519601
return ReplaceAll(path, "netscape", "netsc@pe");
#else
@@ -112,7 +112,7 @@ MungePluginDsoPath(const string& path)
string
UnmungePluginDsoPath(const string& munged)
{
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_SOLARIS)
return ReplaceAll(munged, "netsc@pe", "netscape");
#else
return munged;