diff options
| -rw-r--r-- | libexec/tftpd/tftpd.c | 4 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 29d4748f6b7..62e7f8a28b3 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -69,7 +69,7 @@ static char sccsid[] = "@(#)tftpd.c 5.13 (Berkeley) 2/26/91"; #define TIMEOUT 5 extern int errno; -struct sockaddr_in sin = { AF_INET }; +struct sockaddr_in s_in = { AF_INET }; int peer; int rexmtval = TIMEOUT; int maxtimeout = 5*TIMEOUT; @@ -164,7 +164,7 @@ main(ac, av) syslog(LOG_ERR, "socket: %m\n"); exit(1); } - if (bind(peer, (struct sockaddr *)&sin, sizeof (sin)) < 0) { + if (bind(peer, (struct sockaddr *)&s_in, sizeof (s_in)) < 0) { syslog(LOG_ERR, "bind: %m\n"); exit(1); } diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 7dedd3e6338..db355687287 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -43,7 +43,7 @@ char copyright[] = #ifndef lint static char sccsid[] = "@(#)disklabel.c 5.20 (Berkeley) 2/9/91"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ -static char rcsid[] = "$Header: /cvsroot/src/sbin/disklabel/Attic/disklabel.c,v 1.4 1993/03/23 00:26:44 cgd Exp $"; +static char rcsid[] = "$Header: /cvsroot/src/sbin/disklabel/Attic/disklabel.c,v 1.5 1993/04/18 18:22:33 mycroft Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -57,6 +57,7 @@ static char rcsid[] = "$Header: /cvsroot/src/sbin/disklabel/Attic/disklabel.c,v #include <sys/disklabel.h> #include <stdio.h> #include <ctype.h> +#include <unistd.h> #include "pathnames.h" /* @@ -361,7 +362,6 @@ writelabel(f, boot, lp) { register int i; int flag; - off_t lseek(); #ifdef __386BSD__ off_t lbl_off; struct partition *pp = lp->d_partitions; #endif |
