From 361b8f14561cca9c197ba13156a457850223c8ab Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sf.net>
Date: Mon, 23 Nov 2020 23:40:45 +0000
Subject: [PATCH] dtappbbuilder: Resolve GCC 10 errors about multiple
 definitions of global variables

---
 cde/programs/dtappbuilder/src/ab/ab_bil.c            | 2 +-
 cde/programs/dtappbuilder/src/ab/cgen_utils.c        | 2 +-
 cde/programs/dtappbuilder/src/ab/proj.c              | 2 +-
 cde/programs/dtappbuilder/src/ab/projP_utils.c       | 2 +-
 cde/programs/dtappbuilder/src/ab/proj_utils.c        | 2 +-
 cde/programs/dtappbuilder/src/libABil/bil_loadfile.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cde/programs/dtappbuilder/src/ab/ab_bil.c b/cde/programs/dtappbuilder/src/ab/ab_bil.c
index 1df81051d..cc76f20b1 100644
--- a/cde/programs/dtappbuilder/src/ab/ab_bil.c
+++ b/cde/programs/dtappbuilder/src/ab/ab_bil.c
@@ -88,7 +88,7 @@ static int print_load_stats(
 		ABProfiledInterval	configTime
 		);
 
-char	Buf[MAXPATHLEN];	/* Work buffer */
+extern char	Buf[MAXPATHLEN];	/* Work buffer */
 
 /*
  * Loads in a new project, replacing the current project.
diff --git a/cde/programs/dtappbuilder/src/ab/cgen_utils.c b/cde/programs/dtappbuilder/src/ab/cgen_utils.c
index f7cd2fe56..7c77cbe65 100644
--- a/cde/programs/dtappbuilder/src/ab/cgen_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/cgen_utils.c
@@ -108,7 +108,7 @@ typedef enum
 } CG_STATUS;
 
 
-CGenOptions		CodeGenOptions;
+extern CGenOptions		CodeGenOptions;
 StringList	    user_env_vars = NULL;
 StringList	    module_list = NULL;
 static CG_GOAL      user_goal = CG_GOAL_UNDEF;
diff --git a/cde/programs/dtappbuilder/src/ab/proj.c b/cde/programs/dtappbuilder/src/ab/proj.c
index cb319f591..4bf6679f5 100644
--- a/cde/programs/dtappbuilder/src/ab/proj.c
+++ b/cde/programs/dtappbuilder/src/ab/proj.c
@@ -228,7 +228,7 @@ static XtTranslations proj_transtbl = NULL;
 static XRectangle       *rband_rect = NULL;
 static Boolean          mselect_adjust = False;
 
-char			Buf[MAXPATHLEN];	/* Work buffer */
+extern char			Buf[MAXPATHLEN];	/* Work buffer */
 
 /*************************************************************************
 **
diff --git a/cde/programs/dtappbuilder/src/ab/projP_utils.c b/cde/programs/dtappbuilder/src/ab/projP_utils.c
index 77dce554b..30a9c868e 100644
--- a/cde/programs/dtappbuilder/src/ab/projP_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/projP_utils.c
@@ -93,7 +93,7 @@ static void     mult_module_selected(
 **                                                                      **
 **************************************************************************/
 
-char		Buf[MAXPATHLEN];	/* Work buffer */
+extern char		Buf[MAXPATHLEN];	/* Work buffer */
 
 /*************************************************************************
 **                                                                      **
diff --git a/cde/programs/dtappbuilder/src/ab/proj_utils.c b/cde/programs/dtappbuilder/src/ab/proj_utils.c
index ad74deedc..d649f98ca 100644
--- a/cde/programs/dtappbuilder/src/ab/proj_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/proj_utils.c
@@ -79,7 +79,7 @@
 
 const char 	mod_path[] = "*proj_mod_path";
 const char 	proj_path[] = "*proj_proj_path";
-char		Buf[MAXPATHLEN];	/* Work buffer */
+extern char		Buf[MAXPATHLEN];	/* Work buffer */
 
 /* Whether we are to export a module as BIL (default) or UIL */
 static BOOL ExportAsUIL = FALSE;
diff --git a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
index 12185d2e0..b8575db94 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
+++ b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
@@ -60,7 +60,7 @@
 #include "bilP.h"
 
 BIL_LOAD_INFO	bilP_load;
-char		Buf[MAXPATHLEN];
+static char		Buf[MAXPATHLEN];
 
 /*
  * Read a BIL file into memory. Returns a project node.