summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2019-10-04 04:37:51 -0500
committerathenian200 <athenian200@outlook.com>2019-10-21 04:53:43 -0500
commit575f51a27d6b3627ae5675cc8e920c8dcae073bd (patch)
tree30a30c687b2d45a0c866e2d16e4974b67ffd4f61
parentdb34ef993c3b0a25619ec56d98303933b61169bc (diff)
downloadUXP-575f51a27d6b3627ae5675cc8e920c8dcae073bd.tar
UXP-575f51a27d6b3627ae5675cc8e920c8dcae073bd.tar.gz
UXP-575f51a27d6b3627ae5675cc8e920c8dcae073bd.tar.lz
UXP-575f51a27d6b3627ae5675cc8e920c8dcae073bd.tar.xz
UXP-575f51a27d6b3627ae5675cc8e920c8dcae073bd.zip
Fix a bunch of dumb typos and omissions.
-rw-r--r--config/external/nspr/pr/moz.build2
-rw-r--r--dom/plugins/ipc/PluginModuleChild.cpp2
-rw-r--r--ipc/chromium/src/base/message_pump_glib.cc2
-rw-r--r--ipc/chromium/src/chrome/common/transport_dib.h2
-rw-r--r--js/src/jsnativestack.cpp3
-rw-r--r--media/libpng/moz.build4
-rw-r--r--old-configure.in2
-rw-r--r--toolkit/library/moz.build1
-rw-r--r--toolkit/xre/nsSigHandlers.cpp1
-rw-r--r--xpcom/base/nsMemoryReporterManager.cpp2
-rw-r--r--xpcom/io/nsLocalFileUnix.cpp1
-rw-r--r--xpcom/reflect/xptcall/md/unix/moz.build2
12 files changed, 12 insertions, 12 deletions
diff --git a/config/external/nspr/pr/moz.build b/config/external/nspr/pr/moz.build
index 02811aae8..84d6e7903 100644
--- a/config/external/nspr/pr/moz.build
+++ b/config/external/nspr/pr/moz.build
@@ -63,7 +63,7 @@ elif CONFIG['OS_TARGET'] == 'SunOS':
if CONFIG['CPU_ARCH'] == 'x86_64':
SOURCES += ['/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s']
elif CONFIG['CPU_ARCH'] == 'x86':
- SOURCES += ['/nsprpub/pr/src/md/unix/os_SunOS/x86.s']
+ SOURCES += ['/nsprpub/pr/src/md/unix/os_SunOS_x86.s']
elif CONFIG['OS_TARGET'] == 'WINNT':
OS_LIBS += [
'advapi32',
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
index 102c44a5e..f943dfc42 100644
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -286,7 +286,7 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
// TODO: use PluginPRLibrary here
-#if defined(OS_LINUX) || defined(OS_BSD)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
mShutdownFunc =
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
diff --git a/ipc/chromium/src/base/message_pump_glib.cc b/ipc/chromium/src/base/message_pump_glib.cc
index a5e719c72..f92378f3b 100644
--- a/ipc/chromium/src/base/message_pump_glib.cc
+++ b/ipc/chromium/src/base/message_pump_glib.cc
@@ -138,7 +138,7 @@ MessagePumpForUI::MessagePumpForUI()
int flags = fcntl(fds[0], F_GETFL,0);
if (flags == -1)
flags = 0;
- fntl(fds[0], F_SETFL, flags | O_NDELAY);
+ fcntl(fds[0], F_SETFL, flags | O_NDELAY);
#endif
wakeup_pipe_read_ = fds[0];
wakeup_pipe_write_ = fds[1];
diff --git a/ipc/chromium/src/chrome/common/transport_dib.h b/ipc/chromium/src/chrome/common/transport_dib.h
index e3c40768c..f40a97d17 100644
--- a/ipc/chromium/src/chrome/common/transport_dib.h
+++ b/ipc/chromium/src/chrome/common/transport_dib.h
@@ -15,7 +15,7 @@
#if defined(OS_WIN)
#include <windows.h>
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_SOLARIS)
#include "chrome/common/x11_util.h"
#endif
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index 389d7e657..4e96e01e8 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -73,7 +73,8 @@ js::GetNativeStackBaseImpl()
JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0);
-void js::GetNativeStackBaseImpl()
+void*
+js::GetNativeStackBaseImpl()
{
stack_t st;
stack_getbounds(&st);
diff --git a/media/libpng/moz.build b/media/libpng/moz.build
index 782aa93df..f2538484b 100644
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -52,5 +52,5 @@ FINAL_LIBRARY = 'gkmedias'
# We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True
-if CONFIG['GNU_CC']
- CFLAGS += ['std=c89']
+if CONFIG['GNU_CC']:
+ CFLAGS += ['-std=c89']
diff --git a/old-configure.in b/old-configure.in
index f8fb9245b..c5b4f1efb 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1197,7 +1197,7 @@ case "$target" in
fi
;;
-*-solaris*
+*-solaris*)
MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
;;
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index cd900a615..293c2feaf 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -274,6 +274,7 @@ if CONFIG['OS_ARCH'] == 'SunOS':
OS_LIBS += [
'elf',
'demangle',
+ 'sendfile',
]
if CONFIG['OS_ARCH'] == 'FreeBSD':
diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp
index bcbcb6e3d..a3a366f95 100644
--- a/toolkit/xre/nsSigHandlers.cpp
+++ b/toolkit/xre/nsSigHandlers.cpp
@@ -225,7 +225,6 @@ static void fpehandler(int signum, siginfo_t *si, void *context)
#endif
#endif
}
-}
#endif
void InstallSignalHandlers(const char *aProgname)
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 9c2d620cc..dcbad171e 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -1151,7 +1151,7 @@ ResidentPeakDistinguishedAmount(int64_t* aN)
#ifdef XP_MACOSX
*aN = usage.ru_maxrss;
#elif defined(XP_SOLARIS)
- *aN = usage.ru.maxrss * getpagesize();
+ *aN = usage.ru_maxrss * getpagesize();
#else
*aN = usage.ru_maxrss * 1024;
#endif
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index c0b5c0f48..06706235d 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -1608,7 +1608,6 @@ nsLocalFile::IsExecutable(bool* aResult)
}
#endif
if (*aResult || errno == EACCES) {
- if (*aResult || errno == EACCES) {
return NS_OK;
}
return NSRESULT_FOR_ERRNO();
diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build
index c5cba0c8d..a00588028 100644
--- a/xpcom/reflect/xptcall/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/md/unix/moz.build
@@ -56,7 +56,7 @@ if CONFIG['OS_ARCH'] == 'SunOS':
'xptcinvoke_x86_64_unix.cpp',
'xptcstubs_x86_64_linux.cpp'
]
- elif CONFIG['OS_TEST'] == 'x86':
+ elif '86' in CONFIG['OS_TEST']:
SOURCES += [
'xptcinvoke_gcc_x86_unix.cpp',
'xptcstubs_gcc_x86_unix.cpp'