X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/ad7871609881e73855d0b04da49b486cd93efca7..ed554bc5e4201344d7eaad78263566e79428759c:/usr/src/usr.bin/telnet/sys_bsd.c

diff --git a/usr/src/usr.bin/telnet/sys_bsd.c b/usr/src/usr.bin/telnet/sys_bsd.c
index 0411a596ec..85414e24bc 100644
--- a/usr/src/usr.bin/telnet/sys_bsd.c
+++ b/usr/src/usr.bin/telnet/sys_bsd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)sys_bsd.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)sys_bsd.c	8.2 (Berkeley) 12/15/93";
 #endif /* not lint */
 
 /*
@@ -65,7 +65,7 @@ static char sccsid[] = "@(#)sys_bsd.c	8.1 (Berkeley) 6/6/93";
 
 #ifdef	SIGINFO
 extern SIG_FUNC_RET ayt_status();
-#endif	SIGINFO
+#endif
 
 int
 	tout,			/* Output file descriptor */
@@ -611,18 +611,18 @@ TerminalNewMode(f)
 
     if (f != -1) {
 #ifdef	SIGTSTP
-	static SIG_FUNC_RET susp();
+	SIG_FUNC_RET susp();
 #endif	/* SIGTSTP */
 #ifdef	SIGINFO
-	static SIG_FUNC_RET ayt();
-#endif	SIGINFO
+	SIG_FUNC_RET ayt();
+#endif
 
 #ifdef	SIGTSTP
 	(void) signal(SIGTSTP, susp);
 #endif	/* SIGTSTP */
 #ifdef	SIGINFO
 	(void) signal(SIGINFO, ayt);
-#endif	SIGINFO
+#endif
 #if	defined(USE_TERMIO) && defined(NOKERNINFO)
 	tmp_tc.c_lflag |= NOKERNINFO;
 #endif
@@ -666,7 +666,7 @@ TerminalNewMode(f)
 	SIG_FUNC_RET ayt_status();
 
 	(void) signal(SIGINFO, ayt_status);
-#endif	SIGINFO
+#endif
 #ifdef	SIGTSTP
 	(void) signal(SIGTSTP, SIG_DFL);
 	(void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
@@ -810,7 +810,7 @@ NetSetPgrp(fd)
  */
 
     /* ARGSUSED */
-    static SIG_FUNC_RET
+    SIG_FUNC_RET
 deadpeer(sig)
     int sig;
 {
@@ -819,7 +819,7 @@ deadpeer(sig)
 }
 
     /* ARGSUSED */
-    static SIG_FUNC_RET
+    SIG_FUNC_RET
 intr(sig)
     int sig;
 {
@@ -832,7 +832,7 @@ intr(sig)
 }
 
     /* ARGSUSED */
-    static SIG_FUNC_RET
+    SIG_FUNC_RET
 intr2(sig)
     int sig;
 {
@@ -849,7 +849,7 @@ intr2(sig)
 
 #ifdef	SIGTSTP
     /* ARGSUSED */
-    static SIG_FUNC_RET
+    SIG_FUNC_RET
 susp(sig)
     int sig;
 {
@@ -862,7 +862,7 @@ susp(sig)
 
 #ifdef	SIGWINCH
     /* ARGSUSED */
-    static SIG_FUNC_RET
+    SIG_FUNC_RET
 sendwin(sig)
     int sig;
 {
@@ -874,7 +874,7 @@ sendwin(sig)
 
 #ifdef	SIGINFO
     /* ARGSUSED */
-    static SIG_FUNC_RET
+    SIG_FUNC_RET
 ayt(sig)
     int sig;
 {
@@ -1113,7 +1113,7 @@ process_rings(netin, netout, netex, ttyin, ttyout, poll)
 	}
 	settimer(didnetreceive);
 #else	/* !defined(SO_OOBINLINE) */
-	c = recv(net, netiring.supply, canread, 0);
+	c = recv(net, (char *)netiring.supply, canread, 0);
 #endif	/* !defined(SO_OOBINLINE) */
 	if (c < 0 && errno == EWOULDBLOCK) {
 	    c = 0;