From 948b0c3b3c2913016304159b297a2e8e421b81ac Mon Sep 17 00:00:00 2001
From: Dan Church <amphetamachine@gmail.com>
Date: Fri, 27 Aug 2021 15:25:24 -0500
Subject: [PATCH] Fix compilation under GCC 10+

---
 gui/Config.c             |  3 +++
 gui/Linux.h              |  4 ++--
 plugins/bladesio1/sio1.c |  2 --
 plugins/dfinput/pad.h    |  2 +-
 plugins/dfnet/cfg.c      |  2 ++
 plugins/dfnet/dfnet.h    | 30 +++++++++++++++---------------
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/gui/Config.c b/gui/Config.c
index 16c29c9a..a62c1fb0 100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -24,6 +24,9 @@
 
 #include "Linux.h"
 
+char cfgfile_basename[MAXPATHLEN];
+char cfgfile[MAXPATHLEN];
+
 /* TODO escaping/unescaping would be nice, as would maxchars */
 static void GetValue(char *src, char *name, char *outvar) {
 	char *tmp;
diff --git a/gui/Linux.h b/gui/Linux.h
index 2a939050..99404d93 100644
--- a/gui/Linux.h
+++ b/gui/Linux.h
@@ -44,8 +44,8 @@
 
 extern gboolean UseGui;
 extern int StatesC;
-char cfgfile[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
-char cfgfile_basename[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
+extern char cfgfile[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
+extern char cfgfile_basename[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
 
 int LoadConfig();
 void SaveConfig();
diff --git a/plugins/bladesio1/sio1.c b/plugins/bladesio1/sio1.c
index feab1bb6..652c7a2d 100644
--- a/plugins/bladesio1/sio1.c
+++ b/plugins/bladesio1/sio1.c
@@ -55,8 +55,6 @@ static const unsigned char build	= 1;
 
 static void (CALLBACK *irqCallback)() = 0;
 
-Settings settings;
-
 /* sio status flags.
  */
 enum {
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index 3051e6ad..625d4102 100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -151,7 +151,7 @@ typedef struct tagKeyDef {
 enum { ANALOG_XP = 0, ANALOG_XM, ANALOG_YP, ANALOG_YM };
 
 #if SDL_VERSION_ATLEAST(2,0,0)
-SDL_GameControllerButton controllerMap[DKEY_TOTAL];	
+extern SDL_GameControllerButton controllerMap[DKEY_TOTAL];
 #endif
 
 typedef struct tagPadDef {
diff --git a/plugins/dfnet/cfg.c b/plugins/dfnet/cfg.c
index 921efbe3..ec7bac8c 100644
--- a/plugins/dfnet/cfg.c
+++ b/plugins/dfnet/cfg.c
@@ -13,6 +13,8 @@
 
 #define CFG_FILENAME "dfnet.cfg"
 
+Config conf;
+
 void SaveConf() {
 	FILE *f;
 
diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index b824a790..1c4e5bdb 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -56,7 +56,7 @@ __private_extern char* PLUGLOC(char* toloc);
 
 typedef void* HWND;
 
-struct timeval tm;
+extern struct timeval tm;
 
 #define CALLBACK
 
@@ -70,24 +70,24 @@ typedef struct {
 	char ipAddress[32];
 } Config;
 
-Config conf;
+extern Config conf;
 
 void LoadConf();
 void SaveConf();
 
-int sock;
-char *PadSendData;
-char *PadRecvData;
-char PadSendSize;
-char PadRecvSize;
-char PadSize[2];
-int PadCount;
-int PadCountMax;
-int PadInit;
-int Ping;
-volatile int WaitCancel;
-fd_set rset;
-fd_set wset;
+extern int sock;
+extern char *PadSendData;
+extern char *PadRecvData;
+extern char PadSendSize;
+extern char PadRecvSize;
+extern char PadSize[2];
+extern int PadCount;
+extern int PadCountMax;
+extern int PadInit;
+extern int Ping;
+extern volatile int WaitCancel;
+extern fd_set rset;
+extern fd_set wset;
 
 long sockInit();
 long sockShutdown();