From b25395fab6fe9ee38bc0cd359941d0a825d88451 Mon Sep 17 00:00:00 2001 From: Denis Gorodnichev Date: Thu, 24 Jul 2014 10:37:41 +0400 Subject: merge metacity(gtk3) changes merge metacity(gtk3) changes fix warnings clean up unused variables replace UNUSED_VARIABLE by G_GNUC_UNUSED --- src/compositor/compositor-xrender.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/compositor/compositor-xrender.c') diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index 68898257..31b0be2c 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -62,12 +62,6 @@ #define USE_IDLE_REPAINT 1 -#ifdef __GNUC__ -#define UNUSED_VARIABLE __attribute__ ((unused)) -#else -#define UNUSED_VARIABLE -#endif - #ifdef HAVE_COMPOSITE_EXTENSIONS static inline gboolean composite_at_least_version (MetaDisplay *display, @@ -1150,8 +1144,7 @@ paint_windows (MetaScreen *screen, MetaCompScreen *info = meta_screen_get_compositor_data (screen); Display *xdisplay = meta_display_get_xdisplay (display); GList *index, *last; - int screen_width, screen_height, UNUSED_VARIABLE screen_number; - Window UNUSED_VARIABLE xroot; + int screen_width, screen_height; MetaCompWindow *cw; XserverRegion paint_region, desktop_region; @@ -1161,8 +1154,6 @@ paint_windows (MetaScreen *screen, } meta_screen_get_size (screen, &screen_width, &screen_height); - screen_number = meta_screen_get_screen_number (screen); - xroot = meta_screen_get_xroot (screen); if (region == None) { -- cgit v1.2.1