1 Various ifdef Solaris fixes. 

     2 Recast for getpid() because it requires an int. 

     3 Changing default flags for compiling on SSE. We can try removing these or add

     4 them to the config lines in Makefile. 

     5 

     6 diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild

     7 --- a/build/gyp.mozbuild

     8 +++ b/build/gyp.mozbuild

     9 @@ -45,6 +45,7 @@

    10      'moz_widget_toolkit_gonk': 0,

    11      'moz_webrtc_omx': 0,

    12  

    13 +    'use_official_google_api_keys': 0,

    14      # (for vp8) chromium sets to 0 also

    15      'use_temporal_layers': 0,

    16  

    17 diff --git a/configure b/configure

    18 --- a/configure

    19 +++ b/configure

    20 @@ -9650,8 +9650,8 @@

    21         CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions,no%except -norunpath -D__FUNCTION__=__func__ -template=no%extdef"

    22         LDFLAGS="-xildoff $LDFLAGS"

    23         MMX_FLAGS="-xarch=mmx -xO4"

    24 -       SSE_FLAGS="-xarch=sse"

    25 -       SSE2_FLAGS="-xarch=ssei2 -xO4"

    26 +       SSE_FLAGS="-xarch=sse -xO4"

    27 +       SSE2_FLAGS="-xarch=sse2 -xO4"

    28         if test -z "$CROSS_COMPILE" -a -f /usr/lib/ld/map.noexstk; then

    29             _SAVE_LDFLAGS=$LDFLAGS

    30             LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"

    31 diff --git a/media/libsoundtouch/src/FIRFilter.cpp b/media/libsoundtouch/src/FIRFilter.cpp

    32 --- a/media/libsoundtouch/src/FIRFilter.cpp

    33 +++ b/media/libsoundtouch/src/FIRFilter.cpp

    34 @@ -46,6 +46,10 @@

    35  #include "FIRFilter.h"

    36  #include "cpu_detect.h"

    37  

    38 +#ifdef __sun

    39 +#include <alloca.h>

    40 +#endif

    41 +

    42  using namespace soundtouch;

    43  

    44  /*****************************************************************************

    45 diff --git a/media/libsoundtouch/src/SoundTouch.cpp b/media/libsoundtouch/src/SoundTouch.cpp

    46 --- a/media/libsoundtouch/src/SoundTouch.cpp

    47 +++ b/media/libsoundtouch/src/SoundTouch.cpp

    48 @@ -80,6 +80,10 @@

    49  #include "RateTransposer.h"

    50  #include "cpu_detect.h"

    51  

    52 +#ifdef __sun

    53 +#include <alloca.h>

    54 +#endif

    55 +

    56  using namespace soundtouch;

    57  

    58  /// test if two floating point numbers are equal

    59 diff --git a/media/webrtc/trunk/build/common.gypi b/media/webrtc/trunk/build/common.gypi

    60 --- a/media/webrtc/trunk/build/common.gypi

    61 +++ b/media/webrtc/trunk/build/common.gypi

    62 @@ -917,11 +917,16 @@

    63      'android_app_version_name%': 'Developer Build',

    64      'android_app_version_code%': 0,

    65  

    66 -    'sas_dll_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(sas_dll_path))',

    67 -    'wix_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(wix_path))',

    68 +    'conditions': [

    69 +      ['OS=="win"', {

    70 +        'sas_dll_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(sas_dll_path))',

    71 +        'wix_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(wix_path))',

    72 +      }],

    73 +    ],

    74  

    75      'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',

    76      'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',

    77 +    'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',

    78  

    79      'conditions': [

    80        ['"<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {

    81 diff --git a/memory/volatile/VolatileBufferFallback.cpp b/memory/volatile/VolatileBufferFallback.cpp

    82 --- a/memory/volatile/VolatileBufferFallback.cpp

    83 +++ b/memory/volatile/VolatileBufferFallback.cpp

    84 @@ -7,7 +7,7 @@

    85  #include "mozilla/mozalloc.h"

    86  

    87  #ifdef MOZ_MEMORY

    88 -int posix_memalign(void** memptr, size_t alignment, size_t size);

    89 +extern "C" int posix_memalign(void** memptr, size_t alignment, size_t size);

    90  #endif

    91  

    92  namespace mozilla {

    93 diff --git a/xpcom/base/nsStatusReporterManager.cpp b/xpcom/base/nsStatusReporterManager.cpp

    94 --- a/xpcom/base/nsStatusReporterManager.cpp

    95 +++ b/xpcom/base/nsStatusReporterManager.cpp

    96 @@ -148,7 +148,7 @@

    97    nsresult rv;

    98  

    99    nsCString filename("status-reports-");

   100 -  filename.AppendInt(getpid());

   101 +  filename.AppendInt((int)getpid());

   102    filename.Append('-');

   103    filename.AppendInt(number++);

   104    filename.AppendLiteral(".json");