Changeset 278685 in webkit

Timestamp:

Jun 9, 2021, 6:13:48 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r278672. rdar://problem/79111918

Speculative build fix for Win32.
​https://bugs.webkit.org/show_bug.cgi?id=226793
rdar://79032803

Reviewed by Saam Barati.

• API/JSCallbackObject.h:

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

Location:

branches/safari-612.1.15.4-branch/Source/JavaScriptCore

Files:

• API/JSCallbackObject.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

branches/safari-612.1.15.4-branch/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -31 +31 @@
 #include "JSValueRef.h"
 #include "JSObject.h"
+#include <wtf/PlatformCallingConventions.h>
 
 namespace JSC {
@@ -200 +201 @@
 
     static IsoSubspace* subspaceForImpl(VM&, SubspaceAccess);
-    static JSC_HOST_CALL_ATTRIBUTES EncodedJSValue customToPrimitive(JSGlobalObject*, CallFrame*);
+    static EncodedJSValue JSC_HOST_CALL_ATTRIBUTES customToPrimitive(JSGlobalObject*, CallFrame*);
 
     static bool getOwnPropertySlot(JSObject*, JSGlobalObject*, PropertyName, PropertySlot&);

branches/safari-612.1.15.4-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-06-09  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r278672. rdar://problem/79111918
+
+    Speculative build fix for Win32.
+    https://bugs.webkit.org/show_bug.cgi?id=226793
+    rdar://79032803
+    
+    Reviewed by Saam Barati.
+    
+    * API/JSCallbackObject.h:
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278672 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-06-09  Mark Lam  <mark.lam@apple.com>
+
+            Speculative build fix for Win32.
+            https://bugs.webkit.org/show_bug.cgi?id=226793
+            rdar://79032803
+
+            Reviewed by Saam Barati.
+
+            * API/JSCallbackObject.h:
+
 2021-05-13  Chris Dumez  <cdumez@apple.com>