debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtcreate: Resolve GCC 10 errors about multiple definitions of global variables

Browse Source
This commit is contained in:
Peter Howkins
2020-11-24 02:15:51 +00:00
parent 361b8f1456
commit 30f2d925ef
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtcreate/AddFiletype.c
View File

@@ -71,7 +71,7 @@ Widget Licon2;
extern int do_which; extern int do_which;
enum icon_size_range filetype_icon_size = None_Selected; 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;
/******************************************************************************* /*******************************************************************************

5
cde/programs/dtcreate/dtcreate.h
View File

@@ -287,7 +287,7 @@ STORAGECLASS Widget FC_EndByteTextField;
*/ */
STORAGECLASS Widget FC_NameOrPathText; STORAGECLASS Widget FC_NameOrPathText;
STORAGECLASS Widget FC_AndLabel1; STORAGECLASS Widget FC_AndLabel1;
STORAGECLASS Widget FC_PermissionForm; extern Widget FC_PermissionForm;
STORAGECLASS Widget FC_ReadToggle; STORAGECLASS Widget FC_ReadToggle;
STORAGECLASS Widget FC_WriteToggle; STORAGECLASS Widget FC_WriteToggle;
STORAGECLASS Widget FC_ExecuteToggle; STORAGECLASS Widget FC_ExecuteToggle;
@@ -324,7 +324,7 @@ STORAGECLASS SessionData sessiondata;
#ifdef NOEXTERN #ifdef NOEXTERN
STORAGECLASS enum icon_size_range action_icon_size = None_Selected; 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 int pidIconEditor = 0;
STORAGECLASS Boolean bShowPixmaps = TRUE; STORAGECLASS Boolean bShowPixmaps = TRUE;
STORAGECLASS Widget IconSelector = (Widget)NULL; STORAGECLASS Widget IconSelector = (Widget)NULL;
@@ -353,7 +353,6 @@ STORAGECLASS const char *af_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtda
#else /* NOEXTERN */ #else /* NOEXTERN */
STORAGECLASS enum icon_size_range action_icon_size;
STORAGECLASS enum icon_size_range filetype_icon_size; STORAGECLASS enum icon_size_range filetype_icon_size;
STORAGECLASS int pidIconEditor; STORAGECLASS int pidIconEditor;
STORAGECLASS Boolean bShowPixmaps; STORAGECLASS Boolean bShowPixmaps;