diff options
| author | Denis Gorodnichev <[email protected]> | 2014-07-24 10:37:41 +0400 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-25 18:06:24 +0100 |
| commit | b25395fab6fe9ee38bc0cd359941d0a825d88451 (patch) | |
| tree | e7b6720a543a00495fae1dd1423d652056bedb03 /src/compositor | |
| parent | b8d8e52f0effbf76ff909f88932098d4daf4336e (diff) | |
| download | marco-b25395fab6fe9ee38bc0cd359941d0a825d88451.tar.bz2 marco-b25395fab6fe9ee38bc0cd359941d0a825d88451.tar.xz | |
merge metacity(gtk3) changes
merge metacity(gtk3) changes
fix warnings
clean up unused variables
replace UNUSED_VARIABLE by G_GNUC_UNUSED
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor-xrender.c | 11 |
1 files changed, 1 insertions, 10 deletions
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) { |