Fix http://bugs.webkit.org/show_bug.cgi?id=17001 (Build error with Gtk port on Mac...

Reviewed by Darin Adler.

If both XP_MACOSX and XP_UNIX are defined then X11.h and Carbon.h will both be included.
These provide conflicting definitions for a type named 'Cursor'.  As XP_UNIX is set by
the build system when targeting X11, it doesn't make sense for XP_MACOSX to also be set
in this instance.

* bindings/npapi.h: Don't define XP_MACOSX if XP_UNIX is defined.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 840929bd53386329d4e8cbe29855b51f2c4f6392..f579638db443b3e7dcc350b11340226eac4d10d1 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-26  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=17001
+        Bug 17001: Build error with Gtk port on Mac OS X
+
+        If both XP_MACOSX and XP_UNIX are defined then X11.h and Carbon.h will both be included.
+        These provide conflicting definitions for a type named 'Cursor'.  As XP_UNIX is set by
+        the build system when targeting X11, it doesn't make sense for XP_MACOSX to also be set
+        in this instance.
+
+        * bindings/npapi.h: Don't define XP_MACOSX if XP_UNIX is defined.
+

 2008-01-26  Darin Adler  <darin@apple.com>
 
         Reviewed by Oliver.
 2008-01-26  Darin Adler  <darin@apple.com>
 
         Reviewed by Oliver.

diff --git a/JavaScriptCore/bindings/npapi.h b/JavaScriptCore/bindings/npapi.h
index a172c97abee70585d7dc366b4700f217b6bf698c..ba8b6c70998a0082f9d125572b9a8fa6c9e4a5c7 100644 (file)
--- a/JavaScriptCore/bindings/npapi.h
+++ b/JavaScriptCore/bindings/npapi.h
@@ -71,7 +71,7 @@
 #    endif /* XP_PC */
 #endif /* __MWERKS__ */
 
 #    endif /* XP_PC */
 #endif /* __MWERKS__ */
 

-#if defined(__APPLE_CC__) && !defined(__MACOS_CLASSIC__)
+#if defined(__APPLE_CC__) && !defined(__MACOS_CLASSIC__) && !defined(XP_UNIX)

 #   define XP_MACOSX
 #endif
 
 #   define XP_MACOSX
 #endif