Merge branch 'master' into autotools-conversion

This commit is contained in:
Jon Trulson
2020-11-24 16:53:24 -07:00
56 changed files with 307 additions and 186 deletions

View File

@@ -80,6 +80,27 @@
#include "UtilI.h"
#include "ManPageI.h"
/* Global Variables Used to maintain our cache list of help dialogs */
CacheListStruct *pCacheListHead;
CacheListStruct *pCacheListTale;
int totalCacheNodes;
/* Global Variables */
Widget topLevel;
Widget viewWidget;
Widget manWidget;
Widget manBtn;
Widget manText;
Widget manForm;
Widget closeBtn;
/* General global variables */
int runMode;
char *helpClass;
Display *appDisplay;
char *startCommand;
/* Application resource list definition */
static XrmOptionDescRec option_list[] =

View File

@@ -66,25 +66,25 @@
/* Global Variables Used to maintain our cache list of help dialogs */
CacheListStruct *pCacheListHead;
CacheListStruct *pCacheListTale;
int totalCacheNodes;
extern CacheListStruct *pCacheListHead;
extern CacheListStruct *pCacheListTale;
extern int totalCacheNodes;
/* Global Variables */
Widget topLevel;
Widget viewWidget;
Widget manWidget;
Widget manBtn;
Widget manText;
Widget manForm;
Widget closeBtn;
extern Widget topLevel;
extern Widget viewWidget;
extern Widget manWidget;
extern Widget manBtn;
extern Widget manText;
extern Widget manForm;
extern Widget closeBtn;
/* General global variables */
int runMode;
char *helpClass;
Display *appDisplay;
char *startCommand;
extern int runMode;
extern char *helpClass;
extern Display *appDisplay;
extern char *startCommand;