From 3f2f00ff4aa15ab8483741e759d00c0c8f903af4 Mon Sep 17 00:00:00 2001 From: FeRD (Frank Dana) Date: Feb 12 2020 23:26:08 +0000 Subject: Remove dropped patch --- diff --git a/frotz-2.51-extern.patch b/frotz-2.51-extern.patch deleted file mode 100644 index d6adf87..0000000 --- a/frotz-2.51-extern.patch +++ /dev/null @@ -1,147 +0,0 @@ -From a06030444f2d29fcbef69950be6955b199548ffd Mon Sep 17 00:00:00 2001 -From: "FeRD (Frank Dana)" -Date: Wed, 12 Feb 2020 06:08:25 -0500 -Subject: [PATCH] Add externs for multiply-defined variables - ---- - src/curses/ux_audio.c | 2 +- - src/curses/ux_init.c | 5 ++--- - src/curses/ux_input.c | 2 +- - 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 +- - src/sdl/sf_video.c | 2 +- - 9 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c -index 56bcf85..183dab4 100644 ---- a/src/curses/ux_audio.c -+++ b/src/curses/ux_audio.c -@@ -45,7 +45,7 @@ - #include "ux_blorb.h" - #include "ux_audio.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - extern z_header_t z_header; - - #ifndef NO_SOUND -diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c -index 9f719c9..3a01353 100644 ---- a/src/curses/ux_init.c -+++ b/src/curses/ux_init.c -@@ -53,7 +53,7 @@ - #include - #endif - --f_setup_t f_setup; -+extern f_setup_t f_setup; - extern z_header_t z_header; - - volatile sig_atomic_t terminal_resized = 0; -@@ -88,8 +88,7 @@ char stripped_story_name[FILENAME_MAX+1]; - char semi_stripped_story_name[FILENAME_MAX+1]; - */ - --f_setup_t f_setup; --u_setup_t u_setup; -+extern u_setup_t u_setup; - - /* static void sigwinch_handler(int); */ - static void sigint_handler(int); -diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c -index d2be095..9ca51de 100644 ---- a/src/curses/ux_input.c -+++ b/src/curses/ux_input.c -@@ -49,7 +49,7 @@ - - #ifndef NO_SOUND - #include "ux_sema.h" --ux_sem_t sound_done; -+extern ux_sem_t sound_done; - #endif - - static int start_of_prev_word(int, const zchar*); -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 - #endif - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - typedef void (*CLEANFUNC)(); - -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 -