Commit 59e7c54d authored by mrowe@apple.com's avatar mrowe@apple.com

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

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: http://svn.webkit.org/repository/webkit/trunk@29806 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c79eaef4
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.
......
......@@ -71,7 +71,7 @@
# 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment