Merge r258142 - Build failure on ppc64le if __unix is undefined

https://bugs.webkit.org/show_bug.cgi?id=207906 Patch by Mike Gorse <mgorse@suse.com> on 2020-03-09 Reviewed by Yusuke Suzuki. * bmalloc/BPlatform.h: Check for __unix__ along with __unix.
WebKit · Mar 14, 2020 · 2f24e40 · 2f24e40
1 parent af115d3
commit 2f24e40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
@@ -1,3 +1,12 @@
+2020-03-09  Mike Gorse  <mgorse@suse.com>
+
+        Build failure on ppc64le if __unix is undefined
+        https://bugs.webkit.org/show_bug.cgi?id=207906
+
+        Reviewed by Yusuke Suzuki.
+
+        * bmalloc/BPlatform.h: Check for __unix__ along with __unix.
+
 2019-08-26  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [bmalloc] Disable IsoHeap completely if DebugHeap is enabled

diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h
@@ -40,7 +40,7 @@
 #define BOS_DARWIN 1
 #endif
 
-#ifdef __unix
+#if defined(__unix) || defined(__unix__)
 #define BOS_UNIX 1
 #endif