From 26acc5d5c72ac8968758a0975dcd3f506fbcab15 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 2 Jun 2016 00:03:45 +0100 Subject: Move some globals into gui.c --- frontends/amiga/gui.c | 9 +++++++-- frontends/amiga/gui.h | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'frontends/amiga') diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index d7178bcdb..e41b4f05d 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -173,8 +173,6 @@ #define BOOL_MISMATCH(a,b) (1) #endif -static bool ami_quit = false; - extern struct gui_utf8_table *amiga_utf8_table; struct ami_gui_tb_userdata { @@ -183,6 +181,13 @@ struct ami_gui_tb_userdata { int items; }; +struct MinList *window_list = NULL; +struct Screen *scrn = NULL; +struct MsgPort *sport = NULL; +struct gui_window *cur_gw = NULL; + +static bool ami_quit = false; + static struct MsgPort *schedulermsgport = NULL; static struct MsgPort *appport; static Class *urlStringClass; diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 5ca189429..4e36cb63f 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -170,10 +170,10 @@ struct gui_window float scale; }; -struct MinList *window_list; -struct Screen *scrn; -struct MsgPort *sport; -struct gui_window *cur_gw; +extern struct MinList *window_list; +extern struct Screen *scrn; +extern struct MsgPort *sport; +extern struct gui_window *cur_gw; void ami_get_msg(void); void ami_try_quit(void); -- cgit v1.2.3