[Webkit-unassigned] [Bug 117895] [v2.1.2] GTK2 build fails for undefined GDK_IS_X11_DISPLAY

[bugzilla-daemon at webkit.org]

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


Zan Dobersek <zandobersek at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |zandobersek at gmail.com
             Blocks|                            |118980




--- Comment #25 from Zan Dobersek <zandobersek at gmail.com>  2013-07-22 13:27:22 PST ---
(In reply to comment #24)
> (From update of attachment 206413 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=206413&action=review
> 
> > Source/WebCore/platform/gtk/GtkVersioning.h:56
> > +// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility.
> > +#ifndef GDK_IS_X11_DISPLAY
> > +  #ifdef GDK_WINDOWING_X11
> > +    #define GDK_IS_X11_DISPLAY(display) 1
> > +  #else
> > +    #define GDK_IS_X11_DISPLAY(display) 0
> > +  #endif
> > +#endif
> 
> I don't think this is the right fix, this depends on whether GDK_IS_X11_DISPLAY is defined at this point. GDK_IS_X11_DISPLAY is defined in gdk/gdkx.h in GTK+3 and that header is included in GtkVersioning.cpp. I think we should either check for a explicit version here or use GTK_API_VERSION_2 macro. This is causing compile warnings, see:
> 
> In file included from /home/cgarcia/src/git/WebKit/WebKitBuild/Dependencies/Root/include/gtk-3.0/gdk/gdkx.h:43:0,
>                  from ../../Source/WebCore/platform/gtk/GtkVersioning.c:28:
> /home/cgarcia/src/git/WebKit/WebKitBuild/Dependencies/Root/include/gtk-3.0/gdk/x11/gdkx11display.h:49:0: warning: "GDK_IS_X11_DISPLAY" redefined [enabled by default]
> In file included from ../../Source/WebCore/platform/gtk/GtkVersioning.c:22:0:
> ../../Source/WebCore/platform/gtk/GtkVersioning.h:52:0: note: this is the location of the previous definition

Bug #118980.

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