From 419d8eabcd73b76f91ed59bb578fee0cb941f584 Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Sat, 2 Mar 1991 21:40:34 -0800
Subject: [PATCH] ANSI

SCCS-vsn: usr.bin/window/ww.h 3.63
SCCS-vsn: usr.bin/window/wwchild.c 3.15
SCCS-vsn: usr.bin/window/wwgets.c 3.17
SCCS-vsn: usr.bin/window/wwrint.c 3.11
---
 usr/src/usr.bin/window/ww.h      | 4 ++--
 usr/src/usr.bin/window/wwchild.c | 5 +++--
 usr/src/usr.bin/window/wwgets.c  | 5 +++--
 usr/src/usr.bin/window/wwrint.c  | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/usr/src/usr.bin/window/ww.h b/usr/src/usr.bin/window/ww.h
index 8c378d7908..6ce995af7f 100644
--- a/usr/src/usr.bin/window/ww.h
+++ b/usr/src/usr.bin/window/ww.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ww.h	3.62 (Berkeley) %G%
+ *	@(#)ww.h	3.63 (Berkeley) %G%
  */
 
 #ifdef OLD_TTY
@@ -224,7 +224,7 @@ int wwnselect, wwnselecte, wwnselectz;
 #define wwupdate()	wwupdate1(0, wwnrow);
 
 	/* things for handling input */
-int wwrint();		/* interrupt handler */
+void wwrint();		/* interrupt handler */
 struct ww *wwcurwin;	/* window to copy input into */
 char *wwib;		/* input (keyboard) buffer */
 char *wwibe;		/* wwib + sizeof buffer */
diff --git a/usr/src/usr.bin/window/wwchild.c b/usr/src/usr.bin/window/wwchild.c
index 080e45975a..1f071500eb 100644
--- a/usr/src/usr.bin/window/wwchild.c
+++ b/usr/src/usr.bin/window/wwchild.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)wwchild.c	3.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)wwchild.c	3.15 (Berkeley) %G%";
 #endif /* not lint */
 
 #include "ww.h"
@@ -27,7 +27,8 @@ wwchild()
 	char collected = 0;
 
 	olderrno = errno;
-	while ((pid = wait3(&w, WNOHANG|WUNTRACED, (struct rusage *)0)) > 0) {
+	while ((pid =
+	    wait3((int *)&w, WNOHANG|WUNTRACED, (struct rusage *)0)) > 0) {
 		for (wp = wwindex; wp < &wwindex[NWW]; wp++) {
 			if (*wp && (*wp)->ww_state == WWS_HASPROC
 			    && (*wp)->ww_pid == pid) {
diff --git a/usr/src/usr.bin/window/wwgets.c b/usr/src/usr.bin/window/wwgets.c
index 51d12b790d..54cb099906 100644
--- a/usr/src/usr.bin/window/wwgets.c
+++ b/usr/src/usr.bin/window/wwgets.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)wwgets.c	3.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)wwgets.c	3.17 (Berkeley) %G%";
 #endif /* not lint */
 
 #include "ww.h"
@@ -23,6 +23,7 @@ register struct ww *w;
 	register char *p = buf;
 	register char c;
 	char uc = w->ww_unctrl;
+	static void rub();
 
 	w->ww_unctrl = 0;
 	for (;;) {
@@ -71,7 +72,7 @@ register struct ww *w;
 	w->ww_unctrl = uc;
 }
 
-static
+static void
 rub(c, w)
 struct ww *w;
 {
diff --git a/usr/src/usr.bin/window/wwrint.c b/usr/src/usr.bin/window/wwrint.c
index 4682fe306a..959a36a5a8 100644
--- a/usr/src/usr.bin/window/wwrint.c
+++ b/usr/src/usr.bin/window/wwrint.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)wwrint.c	3.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)wwrint.c	3.11 (Berkeley) %G%";
 #endif /* not lint */
 
 #include "ww.h"
@@ -25,6 +25,7 @@ static char sccsid[] = "@(#)wwrint.c	3.10 (Berkeley) %G%";
  * when the buffer is empty; and everywhere else, we only change wwibp.
  * It should be completely safe.
  */
+void
 wwrint()
 {
 	register n;
-- 
2.20.1