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

2020-11-23 22:27:16 +00:00
parent b21968f26a
commit e1196cdfec
3 changed files with 8 additions and 3 deletions
--- a/cde/programs/dtcalc/calctool.h
+++ b/cde/programs/dtcalc/calctool.h
@@ -552,7 +552,9 @@ struct calcVars {                     /* Calctool variables and options. */
 #ifdef hpux
  int keybdID;
 #endif
-} CalcVars ;
+};
+
+extern struct calcVars CalcVars;

 typedef struct calcVars *Vars ;

@@ -568,7 +570,7 @@ typedef struct
   char *session;
 } ApplicationArgs, *ApplicationArgsPtr;

-ApplicationArgs application_args;
+extern ApplicationArgs application_args;

 /* MP definitions. */