Title: [234252] trunk/Source/_javascript_Core
Revision
234252
Author
[email protected]
Date
2018-07-26 02:30:22 -0700 (Thu, 26 Jul 2018)

Log Message

REGRESSION(r234248) [Win] testapi.c: nonstandard extension used: non-constant aggregate initializer
https://bugs.webkit.org/show_bug.cgi?id=188040

Unreviewed build fix for AppleWin port.

* API/tests/testapi.c: Disabled warning C4204.
(testMarkingConstraintsAndHeapFinalizers): Added an explicit void* cast for weakRefs.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/tests/testapi.c (234251 => 234252)


--- trunk/Source/_javascript_Core/API/tests/testapi.c	2018-07-26 09:00:09 UTC (rev 234251)
+++ trunk/Source/_javascript_Core/API/tests/testapi.c	2018-07-26 09:30:22 UTC (rev 234252)
@@ -62,6 +62,10 @@
 #include "PingPongStackOverflowTest.h"
 #include "TypedArrayCTest.h"
 
+#if COMPILER(MSVC)
+#pragma warning(disable:4204)
+#endif
+
 #if JSC_OBJC_API_ENABLED
 void testObjectiveCAPI(void);
 #endif
@@ -1206,7 +1210,7 @@
 
     weakRefs = (JSWeakRef*)calloc(numWeakRefs, sizeof(JSWeakRef));
 
-    JSContextGroupAddMarkingConstraint(group, markingConstraint, weakRefs);
+    JSContextGroupAddMarkingConstraint(group, markingConstraint, (void*)weakRefs);
     JSContextGroupAddHeapFinalizer(group, heapFinalizer, (void*)(uintptr_t)42);
     
     for (i = numWeakRefs; i--;)

Modified: trunk/Source/_javascript_Core/ChangeLog (234251 => 234252)


--- trunk/Source/_javascript_Core/ChangeLog	2018-07-26 09:00:09 UTC (rev 234251)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-07-26 09:30:22 UTC (rev 234252)
@@ -1,5 +1,15 @@
 2018-07-26  Fujii Hironori  <[email protected]>
 
+        REGRESSION(r234248) [Win] testapi.c: nonstandard extension used: non-constant aggregate initializer
+        https://bugs.webkit.org/show_bug.cgi?id=188040
+
+        Unreviewed build fix for AppleWin port.
+
+        * API/tests/testapi.c: Disabled warning C4204.
+        (testMarkingConstraintsAndHeapFinalizers): Added an explicit void* cast for weakRefs.
+
+2018-07-26  Fujii Hironori  <[email protected]>
+
         [JSC API] We should support the symbol type in our C/Obj-C API
         https://bugs.webkit.org/show_bug.cgi?id=175836
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to