Various ifdef Solaris fixes.
Recast for getpid() because it requires an int.
Changing default flags for compiling on SSE. We can try removing these or add
them to the config lines in Makefile.
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -45,6 +45,7 @@
'moz_widget_toolkit_gonk': 0,
'moz_webrtc_omx': 0,
+ 'use_official_google_api_keys': 0,
# (for vp8) chromium sets to 0 also
'use_temporal_layers': 0,
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -9650,8 +9650,8 @@
CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions,no%except -norunpath -D__FUNCTION__=__func__ -template=no%extdef"
LDFLAGS="-xildoff $LDFLAGS"
MMX_FLAGS="-xarch=mmx -xO4"
- SSE_FLAGS="-xarch=sse"
- SSE2_FLAGS="-xarch=ssei2 -xO4"
+ SSE_FLAGS="-xarch=sse -xO4"
+ SSE2_FLAGS="-xarch=sse2 -xO4"
if test -z "$CROSS_COMPILE" -a -f /usr/lib/ld/map.noexstk; then
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
diff --git a/media/libsoundtouch/src/FIRFilter.cpp b/media/libsoundtouch/src/FIRFilter.cpp
--- a/media/libsoundtouch/src/FIRFilter.cpp
+++ b/media/libsoundtouch/src/FIRFilter.cpp
@@ -46,6 +46,10 @@
#include "FIRFilter.h"
#include "cpu_detect.h"
+#ifdef __sun
+#include <alloca.h>
+#endif
+
using namespace soundtouch;
/*****************************************************************************
diff --git a/media/libsoundtouch/src/SoundTouch.cpp b/media/libsoundtouch/src/SoundTouch.cpp
--- a/media/libsoundtouch/src/SoundTouch.cpp
+++ b/media/libsoundtouch/src/SoundTouch.cpp
@@ -80,6 +80,10 @@
#include "RateTransposer.h"
#include "cpu_detect.h"
+#ifdef __sun
+#include <alloca.h>
+#endif
+
using namespace soundtouch;
/// test if two floating point numbers are equal
diff --git a/media/webrtc/trunk/build/common.gypi b/media/webrtc/trunk/build/common.gypi
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -917,11 +917,16 @@
'android_app_version_name%': 'Developer Build',
'android_app_version_code%': 0,
- 'sas_dll_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
- 'wix_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(wix_path))',
+ 'conditions': [
+ ['OS=="win"', {
+ 'sas_dll_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
+ 'wix_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(wix_path))',
+ }],
+ ],
'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
+ 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
'conditions': [
['"<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
diff --git a/memory/volatile/VolatileBufferFallback.cpp b/memory/volatile/VolatileBufferFallback.cpp
--- a/memory/volatile/VolatileBufferFallback.cpp
+++ b/memory/volatile/VolatileBufferFallback.cpp
@@ -7,7 +7,7 @@
#include "mozilla/mozalloc.h"
#ifdef MOZ_MEMORY
-int posix_memalign(void** memptr, size_t alignment, size_t size);
+extern "C" int posix_memalign(void** memptr, size_t alignment, size_t size);
#endif
namespace mozilla {
diff --git a/xpcom/base/nsStatusReporterManager.cpp b/xpcom/base/nsStatusReporterManager.cpp
--- a/xpcom/base/nsStatusReporterManager.cpp
+++ b/xpcom/base/nsStatusReporterManager.cpp
@@ -148,7 +148,7 @@
nsresult rv;
nsCString filename("status-reports-");
- filename.AppendInt(getpid());
+ filename.AppendInt((int)getpid());
filename.Append('-');
filename.AppendInt(number++);
filename.AppendLiteral(".json");