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

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

Browse Source
This commit is contained in:
Peter Howkins
2020-11-24 03:16:50 +00:00
parent 0444e500bc
commit 9ff00704b3
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtudcfonted/mtfgui.c
View File

@@ -66,9 +66,9 @@ extern FalCodeRegion CodeArea[16];
structure of widgets structure of widgets
********************************************************************/ ********************************************************************/
extern Widget toplevel; extern Widget toplevel;
Widget editPopW, extern Widget wgeScro;
wgeScro, extern Widget editPopW;
wgeBulB_edit; Widget wgeBulB_edit;
static Widget wgeStaT_form[EDLIST_MAX], static Widget wgeStaT_form[EDLIST_MAX],
wgeStaT_disp[EDLIST_MAX], wgeStaT_disp[EDLIST_MAX],
wgeStaT_list[EDLIST_MAX], wgeStaT_list[EDLIST_MAX],

15
cde/programs/dtudcfonted/ufont.c
View File

@@ -56,6 +56,21 @@ GetMessage(int set, int number, char *string)
* Widgets * * Widgets *
***************************************************************/ ***************************************************************/
Widget toplevel; Widget toplevel;
Widget editPtnW;
Widget cpyPtnW;
Widget mngPtnW;
EditChar edg;
EditList edlist;
EditPane edpane;
XlibInf xl;
DelInf dn;
DelPtnInf dl[D_MAX] ;
DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */
int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */
EditPtnInf em;
CopyPtnInf cpm;
static Widget dnPopW; static Widget dnPopW;
Widget wgeScro, editPopW; Widget wgeScro, editPopW;

28
cde/programs/dtudcfonted/xoakufont.h
View File

@@ -255,23 +255,23 @@ typedef struct _FontInf {
**********************************************************************/ **********************************************************************/
Widget toplevel; extern Widget toplevel;
Widget editPtnW; extern Widget editPtnW;
Widget cpyPtnW; extern Widget cpyPtnW;
Widget mngPtnW; extern Widget mngPtnW;
EditChar edg; extern EditChar edg;
EditList edlist; extern EditList edlist;
EditPane edpane; extern EditPane edpane;
XlibInf xl; extern XlibInf xl;
DelInf dn; extern DelInf dn;
DelPtnInf dl[D_MAX] ; extern DelPtnInf dl[D_MAX] ;
DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */ extern DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */
int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */ extern int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */
EditPtnInf em; extern EditPtnInf em;
CopyPtnInf cpm; extern CopyPtnInf cpm;
/* /*