external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues 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
Show stats 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
********************************************************************/
extern Widget toplevel;
Widget editPopW,
wgeScro,
wgeBulB_edit;
extern Widget wgeScro;
extern Widget editPopW;
Widget wgeBulB_edit;
static Widget wgeStaT_form[EDLIST_MAX],
wgeStaT_disp[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 *
***************************************************************/
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;
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;
Widget cpyPtnW;
Widget mngPtnW;
extern Widget editPtnW;
extern Widget cpyPtnW;
extern 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 */
extern EditChar edg;
extern EditList edlist;
extern EditPane edpane;
extern XlibInf xl;
extern DelInf dn;
extern DelPtnInf dl[D_MAX] ;
extern DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */
extern int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */
EditPtnInf em;
CopyPtnInf cpm;
extern EditPtnInf em;
extern CopyPtnInf cpm;
/*