Title: [260438] branches/safari-609-branch/Source/WebKitLegacy/win
Revision
260438
Author
[email protected]
Date
2020-04-21 10:27:14 -0700 (Tue, 21 Apr 2020)

Log Message

Cherry-pick r257802. rdar://problem/62093679

    [Win] API header file has USE macro
    https://bugs.webkit.org/show_bug.cgi?id=208534

    Reviewed by Brent Fulgham.

    USE macros should not be used in API header files.

    * WebKitCOMAPI.h:

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

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebKitLegacy/win/ChangeLog (260437 => 260438)


--- branches/safari-609-branch/Source/WebKitLegacy/win/ChangeLog	2020-04-21 17:25:11 UTC (rev 260437)
+++ branches/safari-609-branch/Source/WebKitLegacy/win/ChangeLog	2020-04-21 17:27:14 UTC (rev 260438)
@@ -1,3 +1,30 @@
+2020-04-21  Alan Coon  <[email protected]>
+
+        Cherry-pick r257802. rdar://problem/62093679
+
+    [Win] API header file has USE macro
+    https://bugs.webkit.org/show_bug.cgi?id=208534
+    
+    Reviewed by Brent Fulgham.
+    
+    USE macros should not be used in API header files.
+    
+    * WebKitCOMAPI.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-03-03  Per Arne Vollan  <[email protected]>
+
+            [Win] API header file has USE macro
+            https://bugs.webkit.org/show_bug.cgi?id=208534
+
+            Reviewed by Brent Fulgham.
+
+            USE macros should not be used in API header files.
+
+            * WebKitCOMAPI.h:
+
 2020-02-11  Alan Coon  <[email protected]>
 
         Cherry-pick r256073. rdar://problem/59299148

Modified: branches/safari-609-branch/Source/WebKitLegacy/win/WebKitCOMAPI.h (260437 => 260438)


--- branches/safari-609-branch/Source/WebKitLegacy/win/WebKitCOMAPI.h	2020-04-21 17:25:11 UTC (rev 260437)
+++ branches/safari-609-branch/Source/WebKitLegacy/win/WebKitCOMAPI.h	2020-04-21 17:27:14 UTC (rev 260438)
@@ -42,10 +42,8 @@
 // This bypasses CoCreateInstance entirely, so registry keys and isolated COM manifests aren't needed.
 HRESULT WEBKIT_API WebKitCreateInstance(REFCLSID, IUnknown* pUnkOuter, REFIID, _COM_Outptr_ void** ppvObject);
 
-#if USE(CF)
 typedef struct __CFBundle* CFBundleRef;
 CFBundleRef WEBKIT_API webKitBundle();
-#endif
 
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to