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

diff --git a/usr/src/usr.bin/window/ww.h b/usr/src/usr.bin/window/ww.h
index 8c378d7..6ce995a 100644 (file)
--- a/usr/src/usr.bin/window/ww.h
+++ b/usr/src/usr.bin/window/ww.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ww.h        3.62 (Berkeley) %G%
+ *     @(#)ww.h        3.63 (Berkeley) %G%

  */
 
 #ifdef OLD_TTY
  */
 
 #ifdef OLD_TTY


@@ -224,7 +224,7 @@ int wwnselect, wwnselecte, wwnselectz;
 #define wwupdate()     wwupdate1(0, wwnrow);
 
        /* things for handling input */
 #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 */
 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 080e459..1f07150 100644 (file)
--- a/usr/src/usr.bin/window/wwchild.c
+++ b/usr/src/usr.bin/window/wwchild.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
  */
 
 #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"
 #endif /* not lint */
 
 #include "ww.h"


@@ -27,7 +27,8 @@ wwchild()
        char collected = 0;
 
        olderrno = errno;
        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) {
                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 51d12b7..54cb099 100644 (file)
--- a/usr/src/usr.bin/window/wwgets.c
+++ b/usr/src/usr.bin/window/wwgets.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
  */
 
 #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"
 #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;
        register char *p = buf;
        register char c;
        char uc = w->ww_unctrl;

+       static void rub();

 
        w->ww_unctrl = 0;
        for (;;) {
 
        w->ww_unctrl = 0;
        for (;;) {


@@ -71,7 +72,7 @@ register struct ww *w;
        w->ww_unctrl = uc;
 }
 
        w->ww_unctrl = uc;
 }
 

-static
+static void

 rub(c, w)
 struct ww *w;
 {
 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 4682fe3..959a36a 100644 (file)
--- a/usr/src/usr.bin/window/wwrint.c
+++ b/usr/src/usr.bin/window/wwrint.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
  */
 
 #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"
 #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.
  */
  * when the buffer is empty; and everywhere else, we only change wwibp.
  * It should be completely safe.
  */

+void

 wwrint()
 {
        register n;
 wwrint()
 {
        register n;