diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | modules/benchmark/guibench.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f243d31a..82987c1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,20 +131,16 @@ if(${disversion} LESS 6.99) if((${distro} MATCHES "Red*" OR ${distro} MATCHES "CentOS*" OR ${distro} MATCHES "Oracle*" OR ${distro} MATCHES "openSUSE*" OR ${distro} MATCHES "SUSE*")) message("RPM EL6 - GTK2 - deprecated - support will end at any time") message("RPM EL6 - LS24 - deprecated version 2.34.3 - but ok") - #old deprecated GTK2 - support will end at any time set(HARDINFO2_GTK3 0) - #old deprecated version - but ok set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3) endif() endif() #debian 7 if(${distro}${disversion} MATCHES "DebianGNULinux7") - message("DEB 7 - GTK2 - deprecated - support will end at any time") + message("DEB 7 - GTK2 to avoid c11 for ubergraph - deprecated - support will end at any time") message("DEB 7 - LS24 - deprecated version 2.34.3 - but ok") - #old deprecated GTK2 - support will end at any time set(HARDINFO2_GTK3 0) - #old deprecated version - but ok set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3) endif() diff --git a/modules/benchmark/guibench.c b/modules/benchmark/guibench.c index 8d8aaff3..dac75ead 100644 --- a/modules/benchmark/guibench.c +++ b/modules/benchmark/guibench.c @@ -43,10 +43,10 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) { int i; cairo_t * cr; GdkWindow* window = gtk_widget_get_window(widget); - cairo_region_t * cairoRegion = cairo_region_create(); #if GTK_CHECK_VERSION(3,0,0) + cairo_region_t * cairoRegion = cairo_region_create(); GdkDrawingContext * drawingContext; drawingContext = gdk_window_begin_draw_frame (window,cairoRegion); @@ -113,7 +113,9 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) { } // cleanup +#if GTK_CHECK_VERSION(3,0,0) cairo_region_destroy(cairoRegion); +#endif return FALSE; } @@ -122,7 +124,6 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) { double guibench(double *frameTime, int *frameCount) { GtkWindow * window; - cairo_region_t *region; cairo_t *cr; frametime=frameTime; |