From df2b14ed5f26f6aabaad548d38a24a724b242047 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Thu, 2 Jun 2016 00:14:10 +0100
Subject: Make rxsig private to gui.c

---
 frontends/amiga/arexx.c | 4 ++--
 frontends/amiga/arexx.h | 4 +---
 frontends/amiga/gui.c   | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'frontends/amiga')

diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 03ee8c489..534391b8a 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -109,7 +109,7 @@ STATIC struct ARexxCmd Commands[] =
 	{ NULL, 		0, 				NULL, 		NULL, 		0, 	NULL, 	0, 	0, 	NULL }
 };
 
-BOOL ami_arexx_init(void)
+bool ami_arexx_init(ULONG *rxsig)
 {
 	if((arexx_obj = ARexxObj,
 			AREXX_HostName,"NETSURF",
@@ -119,7 +119,7 @@ BOOL ami_arexx_init(void)
 			AREXX_DefExtension,"nsrx",
 			End))
 	{
-		GetAttr(AREXX_SigMask, arexx_obj, &rxsig);
+		GetAttr(AREXX_SigMask, arexx_obj, rxsig);
 		return true;
 	}
 	else
diff --git a/frontends/amiga/arexx.h b/frontends/amiga/arexx.h
index 198205388..e6c9c7e24 100755
--- a/frontends/amiga/arexx.h
+++ b/frontends/amiga/arexx.h
@@ -22,11 +22,9 @@
 #include <proto/arexx.h>
 #include <classes/arexx.h>
 
-BOOL ami_arexx_init(void);
+bool ami_arexx_init(ULONG *rxsig);
 void ami_arexx_handle(void);
 void ami_arexx_execute(char *);
 void ami_arexx_command(const char *cmd);
 void ami_arexx_cleanup(void);
-
-ULONG rxsig;
 #endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 36447512f..f285d9669 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -198,8 +198,9 @@ static bool win_destroyed;
 static STRPTR nsscreentitle;
 
 static struct MsgPort *applibport = NULL;
-static ULONG applibsig = 0;
 static uint32 ami_appid = 0;
+static ULONG applibsig = 0;
+static ULONG rxsig = 0;
 static struct Hook newprefs_hook;
 
 static STRPTR temp_homepage_url = NULL;
@@ -944,7 +945,7 @@ static void gui_init2(int argc, char** argv)
 	nserror error;
 	struct browser_window *bw = NULL;
 
-	notalreadyrunning = ami_arexx_init();
+	notalreadyrunning = ami_arexx_init(&rxsig);
 
 	/* Treeview init code ends up calling a font function which needs this */
 	glob = &browserglob;
-- 
cgit v1.2.3