From 74d920d351a1344d377152d7bb60e1e3c6f55bd8 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 1 Feb 2020 04:21:43 -0500 Subject: [PATCH] Single definition for z_header --- src/curses/ux_audio.c | 2 +- src/curses/ux_blorb.c | 2 +- src/curses/ux_init.c | 2 +- src/dumb/dinit.c | 2 +- src/dumb/dpic.c | 2 +- src/sdl/sf_fonts.c | 2 +- src/sdl/sf_resource.c | 2 +- src/sdl/sf_video.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index d5d12a7..02a5597 100644 --- a/src/curses/ux_audio.c +++ b/src/curses/ux_audio.c @@ -44,7 +44,7 @@ #include "ux_audio.h" f_setup_t f_setup; -z_header_t z_header; +extern z_header_t z_header; #ifndef NO_SOUND diff --git a/src/curses/ux_blorb.c b/src/curses/ux_blorb.c index f0ee03d..5481b43 100644 --- a/src/curses/ux_blorb.c +++ b/src/curses/ux_blorb.c @@ -39,7 +39,7 @@ #include "ux_blorb.h" f_setup_t f_setup; -z_header_t z_header; +extern z_header_t z_header; u_setup_t u_setup; FILE *blorb_fp; diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c index 663f21d..b23fe2c 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -53,7 +53,7 @@ #endif f_setup_t f_setup; -z_header_t z_header; +extern z_header_t z_header; volatile sig_atomic_t terminal_resized = 0; diff --git a/src/dumb/dinit.c b/src/dumb/dinit.c index 69dced6..ae3daa4 100644 --- a/src/dumb/dinit.c +++ b/src/dumb/dinit.c @@ -24,7 +24,7 @@ #include "dblorb.h" f_setup_t f_setup; -z_header_t z_header; +extern z_header_t z_header; static void print_version(void); diff --git a/src/dumb/dpic.c b/src/dumb/dpic.c index aa31056..d92045e 100644 --- a/src/dumb/dpic.c +++ b/src/dumb/dpic.c @@ -23,7 +23,7 @@ #include "dblorb.h" f_setup_t f_setup; -z_header_t z_header; +extern z_header_t z_header; static struct { diff --git a/src/sdl/sf_fonts.c b/src/sdl/sf_fonts.c index c67dde5..e9147cc 100644 --- a/src/sdl/sf_fonts.c +++ b/src/sdl/sf_fonts.c @@ -37,7 +37,7 @@ typedef struct { char *m_fontfiles[9]; -z_header_t z_header; +extern z_header_t z_header; static char s[1026]; diff --git a/src/sdl/sf_resource.c b/src/sdl/sf_resource.c index 1a10c3b..3c7d13b 100644 --- a/src/sdl/sf_resource.c +++ b/src/sdl/sf_resource.c @@ -39,7 +39,7 @@ zword hx_flags; zword hx_fore_colour; zword hx_back_colour; -z_header_t z_header; +extern z_header_t z_header; bb_map_t *blorb_map; extern FILE *blorb_fp; diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c index 62a9576..62221c4 100644 --- a/src/sdl/sf_video.c +++ b/src/sdl/sf_video.c @@ -47,7 +47,7 @@ static void sf_quitconf(); static bool ApplyPalette(sf_picture *); static ulong screen_palette[16]; -z_header_t z_header; +extern z_header_t z_header; /* clipping region */ static int xmin, xmax, ymin, ymax; -- 2.24.1 From e78494ac9918e38c37c63bc80ebb4494959fa1c5 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 1 Feb 2020 04:31:44 -0500 Subject: [PATCH] Single definition for f_setup --- src/curses/ux_audio.c | 2 +- src/curses/ux_blorb.c | 2 +- src/curses/ux_init.c | 4 ++-- src/dumb/dblorb.c | 2 +- src/dumb/dinit.c | 2 +- src/dumb/dinput.c | 2 +- src/dumb/doutput.c | 2 +- src/dumb/dpic.c | 2 +- src/sdl/sf_util.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index 02a5597..ef97de8 100644 --- a/src/curses/ux_audio.c +++ b/src/curses/ux_audio.c @@ -43,7 +43,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_blorb.c b/src/curses/ux_blorb.c index 5481b43..d1f6e41 100644 --- a/src/curses/ux_blorb.c +++ b/src/curses/ux_blorb.c @@ -38,7 +38,7 @@ #include "ux_frotz.h" #include "ux_blorb.h" -f_setup_t f_setup; +extern f_setup_t f_setup; extern z_header_t z_header; u_setup_t u_setup; diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c index b23fe2c..b7009ae 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -52,7 +52,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; @@ -87,7 +87,7 @@ char stripped_story_name[FILENAME_MAX+1]; char semi_stripped_story_name[FILENAME_MAX+1]; */ -f_setup_t f_setup; +extern f_setup_t f_setup; u_setup_t u_setup; /* static void sigwinch_handler(int); */ 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 ae3daa4..b01415a 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 dde9df6..ec6514a 100644 --- a/src/dumb/dinput.c +++ b/src/dumb/dinput.c @@ -23,7 +23,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/doutput.c b/src/dumb/doutput.c index 95de302..b634600 100644 --- a/src/dumb/doutput.c +++ b/src/dumb/doutput.c @@ -21,7 +21,7 @@ #include "dfrotz.h" -f_setup_t f_setup; +extern f_setup_t f_setup; static bool show_line_numbers = FALSE; static bool show_line_types = -1; diff --git a/src/dumb/dpic.c b/src/dumb/dpic.c index d92045e..9c04c9c 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 71453fa..c6b5bae 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)(); -- 2.24.1 From dad2003922f51800dfaac9e814d3b86c468f0fb7 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 1 Feb 2020 04:39:29 -0500 Subject: [PATCH] Single definition for do_more_prompts --- src/dumb/dfrotz.h | 2 +- src/dumb/dinit.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dumb/dfrotz.h b/src/dumb/dfrotz.h index a271e86..311a870 100644 --- a/src/dumb/dfrotz.h +++ b/src/dumb/dfrotz.h @@ -25,7 +25,7 @@ /* from ../common/setup.h */ extern f_setup_t f_setup; -bool do_more_prompts; +extern bool do_more_prompts; /* From input.c. */ bool is_terminator (zchar); diff --git a/src/dumb/dinit.c b/src/dumb/dinit.c index b01415a..4c7c693 100644 --- a/src/dumb/dinit.c +++ b/src/dumb/dinit.c @@ -55,6 +55,7 @@ static int user_random_seed = -1; static int user_tandy_bit = 0; static bool plain_ascii = FALSE; +bool do_more_prompts; /* * os_process_arguments -- 2.24.1 From c0684879c6b2a224fd693a47af2326e091428822 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 1 Feb 2020 04:39:51 -0500 Subject: [PATCH] Single definition for blorb_map --- src/curses/ux_pic.c | 2 +- src/dumb/dpic.c | 2 +- src/sdl/sf_resource.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/curses/ux_pic.c b/src/curses/ux_pic.c index fb5f512..81409a7 100644 --- a/src/curses/ux_pic.c +++ b/src/curses/ux_pic.c @@ -42,7 +42,7 @@ #define PIC_HEADER_WIDTH 2 #define PIC_HEADER_HEIGHT 4 -bb_map_t *blorb_map; +extern bb_map_t *blorb_map; static struct { int z_num; diff --git a/src/dumb/dpic.c b/src/dumb/dpic.c index 9c04c9c..c1e7ba4 100644 --- a/src/dumb/dpic.c +++ b/src/dumb/dpic.c @@ -38,7 +38,7 @@ static int num_pictures = 0; #ifndef NO_BLORB -bb_map_t *blorb_map; +extern bb_map_t *blorb_map; static int round_div(int x, int y) { diff --git a/src/sdl/sf_resource.c b/src/sdl/sf_resource.c index 3c7d13b..0d1e5a6 100644 --- a/src/sdl/sf_resource.c +++ b/src/sdl/sf_resource.c @@ -40,7 +40,7 @@ zword hx_fore_colour; zword hx_back_colour; extern z_header_t z_header; -bb_map_t *blorb_map; +extern bb_map_t *blorb_map; extern FILE *blorb_fp; -- 2.24.1 From 9fa2bc504cc1ff424b8678cc9c89e03b7ec74ecf Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 1 Feb 2020 04:51:34 -0500 Subject: [PATCH] Eliminate multiple definitions --- src/curses/ux_blorb.c | 2 +- src/curses/ux_input.c | 2 +- src/sdl/sf_video.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/curses/ux_blorb.c b/src/curses/ux_blorb.c index d1f6e41..36ffa1a 100644 --- a/src/curses/ux_blorb.c +++ b/src/curses/ux_blorb.c @@ -40,7 +40,7 @@ extern f_setup_t f_setup; extern z_header_t z_header; -u_setup_t u_setup; +extern u_setup_t u_setup; FILE *blorb_fp; bb_result_t blorb_res; diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c index 568d02c..6f44987 100644 --- a/src/curses/ux_input.c +++ b/src/curses/ux_input.c @@ -47,7 +47,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/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