Changeset 153035 in webkit

Timestamp:

Jul 23, 2013 2:49:31 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Mock GDK_IS_X11_DISPLAY macro can be redefined unnecessarily
​https://bugs.webkit.org/show_bug.cgi?id=118980

Reviewed by Martin Robinson.

• platform/gtk/GtkVersioning.h: Only define the GDK_IS_X11_DISPLAY macro when using the GTK+ 2 API version

as that's the only supported configuration where the macro is not defined. Definining it only if it's not
yet defined at the time of inclusion of this header can cause redefinitions in GTK+ headers that are normally
included later.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/GtkVersioning.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-23  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Mock GDK_IS_X11_DISPLAY macro can be redefined unnecessarily
+        https://bugs.webkit.org/show_bug.cgi?id=118980
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/GtkVersioning.h: Only define the GDK_IS_X11_DISPLAY macro when using the GTK+ 2 API version
+        as that's the only supported configuration where the macro is not defined. Definining it only if it's not
+        yet defined at the time of inclusion of this header can cause redefinitions in GTK+ headers that are normally
+        included later.
+
 2013-07-22  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/gtk/GtkVersioning.h

@@ -37 +37 @@
                                        int width, int height);
 void gdk_screen_get_monitor_workarea(GdkScreen *, int monitor, GdkRectangle *area);
+// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility.
+#ifdef GDK_WINDOWING_X11
+#define GDK_IS_X11_DISPLAY(display) 1
+#else
+#define GDK_IS_X11_DISPLAY(display) 0
+#endif
 #endif
 
@@ -47 +53 @@
 #endif
 
-// 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
-
 G_END_DECLS