Bug 1306828 - Unbreak build on BSDs after bug 1305360. r=jandem
authorJan Beich <jbeich@FreeBSD.org>
Sat, 01 Oct 2016 08:27:39 +0000
changeset 316392 75e9e20c2d2de997edb70d223b9b021ddf45865e
parent 316391 8a886c15e92de913aed3db32720a1c5d7fc4910c
child 316393 b982a2199355bfa77d4880a2246e44e09dd5f9af
push id82435
push userryanvm@gmail.com
push dateTue, 04 Oct 2016 18:59:12 +0000
treeherdermozilla-inbound@cf23f8fe42fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1306828, 1305360
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1306828 - Unbreak build on BSDs after bug 1305360. r=jandem MozReview-Commit-ID: Ji4HfcZ9Ui
js/src/ds/MemoryProtectionExceptionHandler.cpp
--- a/js/src/ds/MemoryProtectionExceptionHandler.cpp
+++ b/js/src/ds/MemoryProtectionExceptionHandler.cpp
@@ -6,17 +6,17 @@
 
 #include "ds/MemoryProtectionExceptionHandler.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 
 #if defined(XP_WIN)
 # include "jswin.h"
-#elif defined(XP_LINUX)
+#elif defined(XP_UNIX) && !defined(XP_DARWIN)
 # include <signal.h>
 # include <sys/types.h>
 # include <unistd.h>
 #elif defined(XP_DARWIN)
 # include <mach/mach.h>
 # include <unistd.h>
 #endif
 
@@ -205,17 +205,17 @@ MemoryProtectionExceptionHandler::uninst
 
         // Restore the previous exception handler.
         MOZ_ALWAYS_TRUE(RemoveVectoredExceptionHandler(sVectoredExceptionHandler));
 
         sExceptionHandlerInstalled = false;
     }
 }
 
-#elif defined(XP_LINUX)
+#elif defined(XP_UNIX) && !defined(XP_DARWIN)
 
 static struct sigaction sPrevSEGVHandler = {};
 
 /*
  * We can only handle one exception. To guard against races and reentrancy,
  * we set this value the first time we enter the exception handler and never
  * touch it again.
  */