Merge branch 'master' into autotools-conversion

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. */
 

cde/programs/dtcalc/motif.c

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

cde/programs/dtcalc/motif.h

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