external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtcalc: Resolve gcc 10 errors about multiple definitions of global variables

Browse source
This commit is contained in:
Peter Howkins 2020-11-23 22:27:16 +00:00
parent b21968f26a
commit e1196cdfec
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cde/programs/dtcalc/calctool.h
View file

@ -552,7 +552,9 @@ struct calcVars { /* Calctool variables and options. */
#ifdef hpux #ifdef hpux
int keybdID; int keybdID;
#endif #endif
} CalcVars ; };
extern struct calcVars CalcVars;
typedef struct calcVars *Vars ; typedef struct calcVars *Vars ;
@ -568,7 +570,7 @@ typedef struct
char *session; char *session;
} ApplicationArgs, *ApplicationArgsPtr; } ApplicationArgs, *ApplicationArgsPtr;
ApplicationArgs application_args; extern ApplicationArgs application_args;
/* MP definitions. */ /* MP definitions. */

3
cde/programs/dtcalc/motif.c
View file

@ -112,6 +112,9 @@ extern XmWidgetExtData _XmGetWidgetExtData(
#include "ds_popup.h" #include "ds_popup.h"
#include "ds_xlib.h" #include "ds_xlib.h"
ApplicationArgs application_args;
XVars X;
Boolean colorSrv; Boolean colorSrv;
static XtResource resources[] = static XtResource resources[] =

2
cde/programs/dtcalc/motif.h
View file

@ -87,7 +87,7 @@ typedef struct Xobject { /* Motif/Xlib graphics object. */
typedef struct Xobject *XVars ; typedef struct Xobject *XVars ;
XVars X ; extern XVars X ;
#ifndef CDE_INSTALLATION_TOP #ifndef CDE_INSTALLATION_TOP
#define CDE_INSTALLATION_TOP "/usr/dt" #define CDE_INSTALLATION_TOP "/usr/dt"