From 30f2d925ef34c52818cb576fba4dcc7d6945f4ab Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Tue, 24 Nov 2020 02:15:51 +0000 Subject: [PATCH] dtcreate: Resolve GCC 10 errors about multiple definitions of global variables --- cde/programs/dtcreate/AddFiletype.c | 2 +- cde/programs/dtcreate/dtcreate.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cde/programs/dtcreate/AddFiletype.c b/cde/programs/dtcreate/AddFiletype.c index 50b5025e2..ef0501aa8 100644 --- a/cde/programs/dtcreate/AddFiletype.c +++ b/cde/programs/dtcreate/AddFiletype.c @@ -71,7 +71,7 @@ Widget Licon2; extern int do_which; enum icon_size_range filetype_icon_size = None_Selected; */ -enum icon_size_range filetype_icon_size; +enum icon_size_range filetype_icon_size = None_Selected; /******************************************************************************* diff --git a/cde/programs/dtcreate/dtcreate.h b/cde/programs/dtcreate/dtcreate.h index 45f10251c..b5316f5bb 100644 --- a/cde/programs/dtcreate/dtcreate.h +++ b/cde/programs/dtcreate/dtcreate.h @@ -287,7 +287,7 @@ STORAGECLASS Widget FC_EndByteTextField; */ STORAGECLASS Widget FC_NameOrPathText; STORAGECLASS Widget FC_AndLabel1; -STORAGECLASS Widget FC_PermissionForm; +extern Widget FC_PermissionForm; STORAGECLASS Widget FC_ReadToggle; STORAGECLASS Widget FC_WriteToggle; STORAGECLASS Widget FC_ExecuteToggle; @@ -324,7 +324,7 @@ STORAGECLASS SessionData sessiondata; #ifdef NOEXTERN STORAGECLASS enum icon_size_range action_icon_size = None_Selected; -STORAGECLASS enum icon_size_range filetype_icon_size = None_Selected; +STORAGECLASS extern enum icon_size_range filetype_icon_size; STORAGECLASS int pidIconEditor = 0; STORAGECLASS Boolean bShowPixmaps = TRUE; STORAGECLASS Widget IconSelector = (Widget)NULL; @@ -353,7 +353,6 @@ STORAGECLASS const char *af_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtda #else /* NOEXTERN */ -STORAGECLASS enum icon_size_range action_icon_size; STORAGECLASS enum icon_size_range filetype_icon_size; STORAGECLASS int pidIconEditor; STORAGECLASS Boolean bShowPixmaps;