From f46c3747188f201a4ef26a8c627ae3c996af84be Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Thu, 1 Mar 2001 06:22:46 +0000
Subject: Include <unistd.h> for getopt's interface rather than declare things
 individually here.

---
 usr.sbin/pcvt/demo/playvt.c        | 10 ++++++----
 usr.sbin/pcvt/ispcvt/ispcvt.c      |  5 +----
 usr.sbin/pcvt/kcon/kcon.c          |  4 +---
 usr.sbin/pcvt/loadfont/loadfont.c  |  5 +----
 usr.sbin/pcvt/scon/scon.c          |  5 +----
 usr.sbin/pcvt/userkeys/vt220keys.c |  5 +----
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/usr.sbin/pcvt/demo/playvt.c b/usr.sbin/pcvt/demo/playvt.c
index b34d798..17eeca9 100644
--- a/usr.sbin/pcvt/demo/playvt.c
+++ b/usr.sbin/pcvt/demo/playvt.c
@@ -30,8 +30,14 @@
  *
  */
 
+#ifndef lint
+#if 0
 static char *id =
 	"@(#)playvt.c, 1.00, Last Edit-Date: [Sun Jan  1 18:32:22 1995]";
+#endif
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
 
 /*---------------------------------------------------------------------------*
  *
@@ -48,10 +54,6 @@ main(argc,argv)
 int argc;
 char *argv[];
 {
-	extern int optind;
-	extern int opterr;
-	extern char *optarg;
-
 	int c;
 	FILE *fp = stdin;
 	volatile int i;
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.c b/usr.sbin/pcvt/ispcvt/ispcvt.c
index d760337..40979ca 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.c
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.c
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <machine/pcvt_ioctl.h>
 
 #define DEFAULTFD 0
@@ -47,10 +48,6 @@ main(argc,argv)
 int argc;
 char *argv[];
 {
-	extern int optind;
-	extern int opterr;
-	extern char *optarg;
-
 	struct pcvtid pcvtid;
 	struct pcvtinfo pcvtinfo;
 	int c;
diff --git a/usr.sbin/pcvt/kcon/kcon.c b/usr.sbin/pcvt/kcon/kcon.c
index 55e14fa..4318bf2 100644
--- a/usr.sbin/pcvt/kcon/kcon.c
+++ b/usr.sbin/pcvt/kcon/kcon.c
@@ -51,6 +51,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <machine/pcvt_ioctl.h>
@@ -75,9 +76,6 @@ main(argc, argv)
 int argc;
 char *argv[];
 {
-	extern char *optarg;
-	extern int optind;
-
 	int c = 0;
 
 	int errf = 0;
diff --git a/usr.sbin/pcvt/loadfont/loadfont.c b/usr.sbin/pcvt/loadfont/loadfont.c
index c1df6e8..acdd013 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.c
+++ b/usr.sbin/pcvt/loadfont/loadfont.c
@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <machine/pcvt_ioctl.h>
@@ -76,10 +77,6 @@ main(argc,argv)
 int argc;
 char *argv[];
 {
-	extern int optind;
-	extern int opterr;
-	extern char *optarg;
-
 	FILE *in;
 	struct stat sbuf, *sbp;
 	unsigned char *fonttab;
diff --git a/usr.sbin/pcvt/scon/scon.c b/usr.sbin/pcvt/scon/scon.c
index 7671292..0d77f11 100644
--- a/usr.sbin/pcvt/scon/scon.c
+++ b/usr.sbin/pcvt/scon/scon.c
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <machine/pcvt_ioctl.h>
 
 #define DEFAULTFD 0
@@ -172,10 +173,6 @@ main(argc,argv)
 int argc;
 char *argv[];
 {
-	extern int optind;
-	extern int opterr;
-	extern char *optarg;
-
 	int c;
 	int fd;
 
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.c b/usr.sbin/pcvt/userkeys/vt220keys.c
index ac9c3fc..9d84473 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.c
+++ b/usr.sbin/pcvt/userkeys/vt220keys.c
@@ -31,6 +31,7 @@ $FreeBSD$
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <unistd.h>
 
 /*
  *      The default toupper() macro is stupid, will toupper anything
@@ -76,10 +77,6 @@ main(argc,argv)
         int argc;
         char *argv[];
 {
-        /* these are defined in the getopt routine                       */
-        extern char *optarg;    /* argument give to an option            */
-        extern int  optind;     /* argv index after option processing    */
-
         int option;             /* option character returned by getopt   */
         int initf = 0;          /* read initialization file              */
         int lockf = 0;          /* lock keys after loading strings       */
-- 
cgit v1.1