summaryrefslogtreecommitdiffstats
path: root/xpcom
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 /xpcom
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 'xpcom')
-rw-r--r--xpcom/ds/nsMathUtils.h3
-rw-r--r--xpcom/glue/FileUtils.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h
index 08bf908da..61eb47501 100644
--- a/xpcom/ds/nsMathUtils.h
+++ b/xpcom/ds/nsMathUtils.h
@@ -11,7 +11,8 @@
#include <cmath>
#include <float.h>
-#ifdef XP_SOLARIS
+#if defined(XP_SOLARIS)
+#include <math.h>
#include <ieeefp.h>
#endif
diff --git a/xpcom/glue/FileUtils.cpp b/xpcom/glue/FileUtils.cpp
index 699812461..53fe68708 100644
--- a/xpcom/glue/FileUtils.cpp
+++ b/xpcom/glue/FileUtils.cpp
@@ -532,7 +532,7 @@ mozilla::ReadAheadFile(mozilla::pathstr_t aFilePath, const size_t aOffset,
if (!aOutFd) {
CloseHandle(fd);
}
-#elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX)
+#elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX) || defined(XP_SOLARIS)
if (!aFilePath) {
if (aOutFd) {
*aOutFd = -1;