WebAssembly: fix windows build
authorjfbastien@apple.com <jfbastien@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Apr 2017 04:46:56 +0000 (04:46 +0000)
committerjfbastien@apple.com <jfbastien@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Apr 2017 04:46:56 +0000 (04:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=170832

Reviewed by Mark Lam.

My previous patch re-declared isIOS which AssemblerCommon.h
already provided, and which was already included by Options.cpp.

* runtime/Options.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/Options.cpp

index cae6d36..996c3f7 100644 (file)
@@ -1,3 +1,15 @@
+2017-04-13  JF Bastien  <jfbastien@apple.com>
+
+        WebAssembly: fix windows build
+        https://bugs.webkit.org/show_bug.cgi?id=170832
+
+        Reviewed by Mark Lam.
+
+        My previous patch re-declared isIOS which AssemblerCommon.h
+        already provided, and which was already included by Options.cpp.
+
+        * runtime/Options.cpp:
+
 2017-04-13  Saam Barati  <sbarati@apple.com>
 
         WebAssembly: We should be able to postMessage a JSWebAssemblyModule
index 0d74f59..fe54075 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "Options.h"
 
+#include "AssemblerCommon.h"
 #include "LLIntCommon.h"
 #include "LLIntData.h"
 #include "SigillCrashAnalyzer.h"
@@ -59,15 +60,6 @@ bool restrictedOptionsEnabled = false;
 #else
 bool restrictedOptionsEnabled = true;
 #endif
-
-ALWAYS_INLINE bool isIOS()
-{
-#if PLATFORM(IOS)
-    return true;
-#else
-    return false;
-#endif
-}
 }
 
 void Options::enableRestrictedOptions(bool enableOrNot)