# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1607488540 0 # Node ID 9395c1efa98b798b98f072665e8bc202a3c09643 # Parent 7677e1083d07142cbd3c265bd17987051d82f575 GTK: _dw_app_id[] is not used with glib prior to 2.28 so move it into #ifdef diff -r 7677e1083d07 -r 9395c1efa98b gtk/dw.c --- a/gtk/dw.c Mon Dec 07 20:01:03 2020 +0000 +++ b/gtk/dw.c Wed Dec 09 04:35:40 2020 +0000 @@ -126,10 +126,10 @@ #if GLIB_CHECK_VERSION(2,28,0) GApplication *_DWApp = NULL; +static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 }; #endif char *_DWDefaultFont = NULL; static char _dw_share_path[PATH_MAX+1] = { 0 }; -static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 }; #if GTK_MAJOR_VERSION < 2 static int _dw_file_active = 0; diff -r 7677e1083d07 -r 9395c1efa98b gtk3/dw.c --- a/gtk3/dw.c Mon Dec 07 20:01:03 2020 +0000 +++ b/gtk3/dw.c Wed Dec 09 04:35:40 2020 +0000 @@ -176,10 +176,10 @@ GObject *_DWObject = NULL; #if GLIB_CHECK_VERSION(2,28,0) GApplication *_DWApp = NULL; +static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 }; #endif char *_DWDefaultFont = NULL; static char _dw_share_path[PATH_MAX+1] = { 0 }; -static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 }; typedef struct {