Title: [97591] trunk/Source/WebCore
- Revision
- 97591
- Author
- [email protected]
- Date
- 2011-10-17 00:51:55 -0700 (Mon, 17 Oct 2011)
Log Message
Fix clang WebKitGTK+ build.
Patch by Andrei Lavreniyuk <[email protected]> on 2011-10-17
Reviewed by Martin Robinson.
* plugins/gtk/PluginViewGtk.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97590 => 97591)
--- trunk/Source/WebCore/ChangeLog 2011-10-17 07:20:00 UTC (rev 97590)
+++ trunk/Source/WebCore/ChangeLog 2011-10-17 07:51:55 UTC (rev 97591)
@@ -1,3 +1,11 @@
+2011-10-17 Andrei Lavreniyuk <[email protected]>
+
+ Fix clang WebKitGTK+ build.
+
+ Reviewed by Martin Robinson.
+
+ * plugins/gtk/PluginViewGtk.cpp:
+
2011-10-16 Adam Barth <[email protected]>
Always disable ENABLE(ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL) and delete associated code
Modified: trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp (97590 => 97591)
--- trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-10-17 07:20:00 UTC (rev 97590)
+++ trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-10-17 07:51:55 UTC (rev 97591)
@@ -71,6 +71,7 @@
#include <gtk/gtk.h>
#if defined(XP_UNIX)
+#define String XtStringType
#include "RefPtrCairo.h"
#include "gtk2xtbin.h"
#define Bool int // this got undefined somewhere
@@ -81,6 +82,7 @@
#elif defined(GDK_WINDOWING_WIN32)
#include "PluginMessageThrottlerWin.h"
#include <gdk/gdkwin32.h>
+#undef String
#endif
using JSC::ExecState;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
