Title: [251063] trunk/Source/WebCore
Revision
251063
Author
timothy_hor...@apple.com
Date
2019-10-13 17:05:47 -0700 (Sun, 13 Oct 2019)

Log Message

Don't include ApplicationServices in npapi.h
https://bugs.webkit.org/show_bug.cgi?id=202911

Reviewed by Sam Weinig.

* plugins/npapi.h:
Just include CoreGraphics.h, not ApplicationServices.h.
ApplicationServices.h pulls in all sorts of crazy things like
QuickDraw headers that have symbol conflicts with JSC (like Handle).

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (251062 => 251063)


--- trunk/Source/WebCore/ChangeLog	2019-10-13 23:49:02 UTC (rev 251062)
+++ trunk/Source/WebCore/ChangeLog	2019-10-14 00:05:47 UTC (rev 251063)
@@ -1,3 +1,15 @@
+2019-10-13  Tim Horton  <timothy_hor...@apple.com>
+
+        Don't include ApplicationServices in npapi.h
+        https://bugs.webkit.org/show_bug.cgi?id=202911
+
+        Reviewed by Sam Weinig.
+
+        * plugins/npapi.h:
+        Just include CoreGraphics.h, not ApplicationServices.h.
+        ApplicationServices.h pulls in all sorts of crazy things like
+        QuickDraw headers that have symbol conflicts with JSC (like Handle).
+
 2019-10-13  Stephan Szabo  <stephan.sz...@sony.com>
 
         Wincairo build broken: EventLoop.h: No such file or directory

Modified: trunk/Source/WebCore/plugins/npapi.h (251062 => 251063)


--- trunk/Source/WebCore/plugins/npapi.h	2019-10-13 23:49:02 UTC (rev 251062)
+++ trunk/Source/WebCore/plugins/npapi.h	2019-10-14 00:05:47 UTC (rev 251063)
@@ -76,7 +76,7 @@
 #endif
 
 #if defined(XP_MACOSX)
-#include <ApplicationServices/ApplicationServices.h>
+#include <CoreGraphics/CoreGraphics.h>
 #include <OpenGL/OpenGL.h>
 #ifndef NP_NO_CARBON
 #include <Carbon/Carbon.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to