From cf151967a51bb72cc8e47b6ba6354b70f4661790 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 17 Nov 1993 16:38:52 +0000
Subject: [PATCH] signal now deals with void functions

---
 lang/cem/libcc/stdio/getpass.c    |  2 +-
 lang/cem/libcc/stdio/popen.c      |  4 ++--
 lang/cem/libcc/stdio/system.c     |  2 +-
 lang/fortran/lib/libF77/s_paus.c  |  2 +-
 lang/fortran/lib/libF77/signal_.c |  2 +-
 lang/occam/lib/channel.c          |  4 ++--
 mach/sparc/libsys/signal.c        | 10 +++++-----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lang/cem/libcc/stdio/getpass.c b/lang/cem/libcc/stdio/getpass.c
index cc90597fa..b5e4e1c0d 100644
--- a/lang/cem/libcc/stdio/getpass.c
+++ b/lang/cem/libcc/stdio/getpass.c
@@ -9,7 +9,7 @@ char *prompt;
 	struct sgttyb tty, ttysave;
 	static char pwdbuf[9];
 	int fd;
-	int (*savesig)();
+	void (*savesig)();
 
 	if ((fd = open("/dev/tty", 0)) < 0) fd = 0;
 	savesig = signal(SIGINT, SIG_IGN);
diff --git a/lang/cem/libcc/stdio/popen.c b/lang/cem/libcc/stdio/popen.c
index 64f96016d..95cde8153 100644
--- a/lang/cem/libcc/stdio/popen.c
+++ b/lang/cem/libcc/stdio/popen.c
@@ -40,8 +40,8 @@ pclose(iop)
 {
 	int fd = fileno(iop);
 	int status, wret;
-	int (*intsave)() = signal(SIGINT, SIG_IGN);
-	int (*quitsave)() = signal(SIGQUIT, SIG_IGN);
+	void (*intsave)() = signal(SIGINT, SIG_IGN);
+	void (*quitsave)() = signal(SIGQUIT, SIG_IGN);
 
 	fclose(iop);
 	while ((wret = wait(&status)) != -1) {
diff --git a/lang/cem/libcc/stdio/system.c b/lang/cem/libcc/stdio/system.c
index 351734f94..fea139e20 100644
--- a/lang/cem/libcc/stdio/system.c
+++ b/lang/cem/libcc/stdio/system.c
@@ -5,7 +5,7 @@ system(str)
 	char *str;
 {
 	int pid, exitstatus, waitval;
-	int (*sigint)(), (*sigquit)();
+	void (*sigint)(), (*sigquit)();
 	int i;
 
 	if ((pid = fork()) < 0) return -1;	/* How do we distinguish this
diff --git a/lang/fortran/lib/libF77/s_paus.c b/lang/fortran/lib/libF77/s_paus.c
index 789e45b85..cac17683f 100644
--- a/lang/fortran/lib/libF77/s_paus.c
+++ b/lang/fortran/lib/libF77/s_paus.c
@@ -2,7 +2,7 @@
 #include "f2c.h"
 #define PAUSESIG 15
 
-static waitpause()
+static void waitpause()
 {
 return;
 }
diff --git a/lang/fortran/lib/libF77/signal_.c b/lang/fortran/lib/libF77/signal_.c
index d8bc3789b..58c49100f 100644
--- a/lang/fortran/lib/libF77/signal_.c
+++ b/lang/fortran/lib/libF77/signal_.c
@@ -1,6 +1,6 @@
 #include "f2c.h"
 
-typedef int (*sig_type)();
+typedef void (*sig_type)();
 extern sig_type signal();
 
 integer signal_(sigp, procp)
diff --git a/lang/occam/lib/channel.c b/lang/occam/lib/channel.c
index be409ffa5..e7579ee4d 100644
--- a/lang/occam/lib/channel.c
+++ b/lang/occam/lib/channel.c
@@ -86,7 +86,7 @@ void chan_out(v, c) long v; register chan *c;
 }
 
 #ifndef __BSD4_2
-static int timeout();
+static void timeout();
 #endif
 
 int chan_any(c) register chan *c;
@@ -170,7 +170,7 @@ int chan_any(c) register chan *c;
  * timeout() to prevent it from getting lost.
  */
 
-static int timeout(sig)
+static void timeout(sig)
 {
 	signal(SIGALRM, timeout);
 	alarm(1);
diff --git a/mach/sparc/libsys/signal.c b/mach/sparc/libsys/signal.c
index 5c829ae1c..9a9574f19 100644
--- a/mach/sparc/libsys/signal.c
+++ b/mach/sparc/libsys/signal.c
@@ -1,11 +1,11 @@
 static long masks[32];
 static long flags[32];
-int (*
+void (*
 signal(sig,handler))()
-	int (*handler)();
+	void (*handler)();
 {
 	struct {
-		int (*sv_handler)();
+		void (*sv_handler)();
 		long	sv_mask;
 		long	sv_flags;
 	} v, ov;
@@ -13,13 +13,13 @@ signal(sig,handler))()
 	v.sv_handler = handler;
 	v.sv_mask = masks[sig];
 	v.sv_flags = flags[sig];
-	if (sigvec(sig,&v, &ov) < 0) return (int (*)()) -1;
+	if (sigvec(sig,&v, &ov) < 0) return (void (*)()) -1;
 	if (v.sv_mask != ov.sv_mask || v.sv_flags != ov.sv_flags) {
 		v.sv_mask = ov.sv_mask;
 		masks[sig] = ov.sv_mask;
 		v.sv_flags = ov.sv_flags;
 		flags[sig] = ov.sv_flags;
-		if (sigvec(sig,&v,(char *) 0) < 0) return (int (*)()) -1;
+		if (sigvec(sig,&v,(char *) 0) < 0) return (void (*)()) -1;
 	}
 	return ov.sv_handler;
 }