Title: [153035] trunk/Source/WebCore
Revision
153035
Author
[email protected]
Date
2013-07-23 02:49:31 -0700 (Tue, 23 Jul 2013)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (153034 => 153035)


--- trunk/Source/WebCore/ChangeLog	2013-07-23 08:24:58 UTC (rev 153034)
+++ trunk/Source/WebCore/ChangeLog	2013-07-23 09:49:31 UTC (rev 153035)
@@ -1,3 +1,15 @@
+2013-07-23  Zan Dobersek  <[email protected]>
+
+        [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  <[email protected]>
 
         StickyPositionConstraints should store the constrainingRectAtLastLayout

Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (153034 => 153035)


--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h	2013-07-23 08:24:58 UTC (rev 153034)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h	2013-07-23 09:49:31 UTC (rev 153035)
@@ -36,7 +36,13 @@
 GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int srcY,
                                        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
 
 GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window);
 
@@ -46,15 +52,6 @@
         (gtk_widget_size_request((widget), ((minimumSize))))
 #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
 
 #endif // GtkVersioning_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to