[gtk+/gtk-2-22] Silence a few warnings in !HAVE_RANDR builds (cherry picked from commit b96a05b81f2de9949da94c376be5



commit d780a23746163690ad4c89e562dc176ec58f6d27
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 3 13:43:42 2010 -0400

    Silence a few warnings in !HAVE_RANDR builds
    (cherry picked from commit b96a05b81f2de9949da94c376be533114025765b)

 gdk/x11/gdkscreen-x11.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 3350162..d5f2688 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -713,6 +713,7 @@ free_monitors (GdkX11Monitor *monitors,
   g_free (monitors);
 }
 
+#ifdef HAVE_RANDR
 static int
 monitor_compare_function (GdkX11Monitor *monitor1,
                           GdkX11Monitor *monitor2)
@@ -737,6 +738,7 @@ monitor_compare_function (GdkX11Monitor *monitor1,
 
   return 0;
 }
+#endif
 
 static gboolean
 init_randr13 (GdkScreen *screen)
@@ -1162,7 +1164,9 @@ _gdk_x11_screen_size_changed (GdkScreen *screen,
 			      XEvent    *event)
 {
   gint width, height;
+#ifdef HAVE_RANDR
   GdkDisplayX11 *display_x11;
+#endif
 
   width = gdk_screen_get_width (screen);
   height = gdk_screen_get_height (screen);
@@ -1182,7 +1186,7 @@ _gdk_x11_screen_size_changed (GdkScreen *screen,
     {
       XConfigureEvent *rcevent = (XConfigureEvent *) event;
       Screen	    *xscreen = gdk_x11_screen_get_xscreen (screen);
-      
+
       xscreen->width   = rcevent->width;
       xscreen->height  = rcevent->height;
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]