[Webkit-unassigned] [Bug 47799] [gtk] clang build fails in X11/Intrinsic.h due to String name conflict

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=47799


Martin Robinson <mrobinson at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #111215|review?                     |review-
               Flag|                            |




--- Comment #14 from Martin Robinson <mrobinson at webkit.org>  2011-10-16 23:37:19 PST ---
(From update of attachment 111215)
View in context: https://bugs.webkit.org/attachment.cgi?id=111215&action=review

Sorry. Should have mentioned the thing below before. Do you mind alos removing the "No new tests" line from the ChangeLog. The commit queue won't land the patch with that there.

> Source/WebCore/plugins/gtk/PluginViewGtk.cpp:76
> +#define String XtStringType
>  #if defined(XP_UNIX)
>  #include "RefPtrCairo.h"
>  #include "gtk2xtbin.h"

Hrm. I'm guessing this should be inside the #if defined(XP_UNIX) block?

> Source/WebCore/plugins/gtk/PluginViewGtk.cpp:86
> +#undef String

Same here...shouldn't this be up above?

> Source/WebCore/ChangeLog:7
> +        No new tests. (OOPS!)

Please remove this line.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.