From f5dd9b5d2836b12f3bbe725346d5faa617df32a1 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Wed, 12 Feb 2020 06:08:25 -0500
Subject: [PATCH 1/2] Single definition for f_setup
---
src/dumb/dblorb.c | 2 +-
src/dumb/dinit.c | 2 +-
src/dumb/dinput.c | 2 +-
src/dumb/dpic.c | 2 +-
src/sdl/sf_util.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/dumb/dblorb.c b/src/dumb/dblorb.c
index 98a62ac..0d1e3a8 100644
--- a/src/dumb/dblorb.c
+++ b/src/dumb/dblorb.c
@@ -33,7 +33,7 @@
#ifndef NO_BLORB
-f_setup_t f_setup;
+extern f_setup_t f_setup;
FILE *blorb_fp;
bb_result_t blorb_res;
diff --git a/src/dumb/dinit.c b/src/dumb/dinit.c
index d03568d..76555de 100644
--- a/src/dumb/dinit.c
+++ b/src/dumb/dinit.c
@@ -23,7 +23,7 @@
#include "dfrotz.h"
#include "dblorb.h"
-f_setup_t f_setup;
+extern f_setup_t f_setup;
extern z_header_t z_header;
static void print_version(void);
diff --git a/src/dumb/dinput.c b/src/dumb/dinput.c
index ede2c92..7e813d8 100644
--- a/src/dumb/dinput.c
+++ b/src/dumb/dinput.c
@@ -24,7 +24,7 @@
#include "dfrotz.h"
-f_setup_t f_setup;
+extern f_setup_t f_setup;
static char runtime_usage[] =
"DUMB-FROTZ runtime help:\n"
diff --git a/src/dumb/dpic.c b/src/dumb/dpic.c
index a9ecf28..c1e7ba4 100644
--- a/src/dumb/dpic.c
+++ b/src/dumb/dpic.c
@@ -22,7 +22,7 @@
#include "dfrotz.h"
#include "dblorb.h"
-f_setup_t f_setup;
+extern f_setup_t f_setup;
extern z_header_t z_header;
diff --git a/src/sdl/sf_util.c b/src/sdl/sf_util.c
index 73251b1..678e1e7 100644
--- a/src/sdl/sf_util.c
+++ b/src/sdl/sf_util.c
@@ -39,7 +39,7 @@
#include <unistd.h>
#endif
-f_setup_t f_setup;
+extern f_setup_t f_setup;
typedef void (*CLEANFUNC)();
--
2.24.1
From 09b5947f62a1cf35ae78c0b60bd28ddbafef232b Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Wed, 12 Feb 2020 06:18:15 -0500
Subject: [PATCH 2/2] Single definition for sdl_active
---
src/sdl/sf_video.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c
index 62221c4..8522dd7 100644
--- a/src/sdl/sf_video.c
+++ b/src/sdl/sf_video.c
@@ -40,7 +40,7 @@ static SDL_Renderer *renderer = NULL;
static SDL_Texture *texture = NULL;
int m_timerinterval = 100;
-bool sdl_active;
+extern bool sdl_active;
static void sf_quitconf();
--
2.24.1