Title: [215356] trunk/Source/_javascript_Core
Revision
215356
Author
jfbast...@apple.com
Date
2017-04-13 21:46:56 -0700 (Thu, 13 Apr 2017)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (215355 => 215356)


--- trunk/Source/_javascript_Core/ChangeLog	2017-04-14 04:33:07 UTC (rev 215355)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-04-14 04:46:56 UTC (rev 215356)
@@ -1,3 +1,15 @@
+2017-04-13  JF Bastien  <jfbast...@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  <sbar...@apple.com>
 
         WebAssembly: We should be able to postMessage a JSWebAssemblyModule

Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (215355 => 215356)


--- trunk/Source/_javascript_Core/runtime/Options.cpp	2017-04-14 04:33:07 UTC (rev 215355)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp	2017-04-14 04:46:56 UTC (rev 215356)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "Options.h"
 
+#include "AssemblerCommon.h"
 #include "LLIntCommon.h"
 #include "LLIntData.h"
 #include "SigillCrashAnalyzer.h"
@@ -59,16 +60,7 @@
 #else
 bool restrictedOptionsEnabled = true;
 #endif
-
-ALWAYS_INLINE bool isIOS()
-{
-#if PLATFORM(IOS)
-    return true;
-#else
-    return false;
-#endif
 }
-}
 
 void Options::enableRestrictedOptions(bool enableOrNot)
 {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to