From b890cc7ab8a4857929374481bc860a9adbff053e Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Wed, 3 Apr 1991 23:48:31 -0800
Subject: [PATCH] protect all user-level include files against reinclusion

SCCS-vsn: include/ttyent.h 5.7
SCCS-vsn: include/tzfile.h 5.10
SCCS-vsn: include/unistd.h 5.10
SCCS-vsn: include/utime.h 5.4
SCCS-vsn: include/utmp.h 5.11
SCCS-vsn: sys/hp300/include/varargs.h 5.3
SCCS-vsn: include/vis.h 5.9
---
 usr/src/include/ttyent.h            |  7 ++++++-
 usr/src/include/tzfile.h            | 12 ++++++++----
 usr/src/include/unistd.h            |  7 ++++++-
 usr/src/include/utime.h             |  7 ++++++-
 usr/src/include/utmp.h              |  7 ++++++-
 usr/src/include/vis.h               |  7 ++++++-
 usr/src/sys/hp300/include/varargs.h |  7 ++++++-
 7 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/usr/src/include/ttyent.h b/usr/src/include/ttyent.h
index 6f77c3eba4..66e86dd891 100644
--- a/usr/src/include/ttyent.h
+++ b/usr/src/include/ttyent.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ttyent.h	5.6 (Berkeley) %G%
+ *	@(#)ttyent.h	5.7 (Berkeley) %G%
  */
 
+#ifndef	_TTYENT_H_
+#define	_TTYENT_H_
+
 #define	_PATH_TTYS	"/etc/ttys"
 
 #define	_TTYS_OFF	"off"
@@ -33,3 +36,5 @@ struct ttyent *getttynam __P((const char *));
 int setttyent __P((void));
 int endttyent __P((void));
 __END_DECLS
+
+#endif /* !_TTYENT_H_ */
diff --git a/usr/src/include/tzfile.h b/usr/src/include/tzfile.h
index a1c8ce3f87..f6c72f4c73 100644
--- a/usr/src/include/tzfile.h
+++ b/usr/src/include/tzfile.h
@@ -7,13 +7,15 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)tzfile.h	5.9 (Berkeley) %G%
+ *	@(#)tzfile.h	5.10 (Berkeley) %G%
  */
 
-/*
-** Information about time zone files.
-*/
+#ifndef _TZFILE_H_
+#define	_TZFILE_H_
 
+/*
+ * Information about time zone files.
+ */
 			/* Time zone object file directory */
 #define TZDIR		"/usr/share/zoneinfo"
 #define TZDEFAULT	"/etc/localtime"
@@ -119,3 +121,5 @@ struct tzhead {
 */
 
 #define isleap(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0)
+
+#endif /* !_TZFILE_H_ */
diff --git a/usr/src/include/unistd.h b/usr/src/include/unistd.h
index 50be41804e..13615f9c3d 100644
--- a/usr/src/include/unistd.h
+++ b/usr/src/include/unistd.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)unistd.h	5.9 (Berkeley) %G%
+ *	@(#)unistd.h	5.10 (Berkeley) %G%
  */
 
+#ifndef _UNISTD_H_
+#define	_UNISTD_H_
+
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/unistd.h>
@@ -152,3 +155,5 @@ int	 vfork __P((void));
 
 #endif /* !_POSIX_SOURCE */
 __END_DECLS
+
+#endif /* !_UNISTD_H_ */
diff --git a/usr/src/include/utime.h b/usr/src/include/utime.h
index 15ab8e2485..f90ad5c42a 100644
--- a/usr/src/include/utime.h
+++ b/usr/src/include/utime.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)utime.h	5.3 (Berkeley) %G%
+ *	@(#)utime.h	5.4 (Berkeley) %G%
  */
 
+#ifndef	_UTIME_H_
+#define	_UTIME_H_
+
 struct utimbuf {
 	time_t actime;		/* Access time */
 	time_t modtime;		/* Modification time */
@@ -17,3 +20,5 @@ struct utimbuf {
 __BEGIN_DECLS
 int utime __P((const char *, const struct utimbuf *));
 __END_DECLS
+
+#endif /* !_UTIME_H_ */
diff --git a/usr/src/include/utmp.h b/usr/src/include/utmp.h
index 131edd6f5d..0d54f84722 100644
--- a/usr/src/include/utmp.h
+++ b/usr/src/include/utmp.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)utmp.h	5.10 (Berkeley) %G%
+ *	@(#)utmp.h	5.11 (Berkeley) %G%
  */
 
+#ifndef	_UTMP_H_
+#define	_UTMP_H_
+
 #define	_PATH_UTMP	"/var/run/utmp"
 #define	_PATH_WTMP	"/var/log/wtmp"
 #define	_PATH_LASTLOG	"/var/log/lastlog"
@@ -27,3 +30,5 @@ struct utmp {
 	char	ut_host[UT_HOSTSIZE];
 	long	ut_time;
 };
+
+#endif /* !_UTMP_H_ */
diff --git a/usr/src/include/vis.h b/usr/src/include/vis.h
index 091f8e52c1..083d0d4a02 100644
--- a/usr/src/include/vis.h
+++ b/usr/src/include/vis.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)vis.h	5.8 (Berkeley) %G%
+ *	@(#)vis.h	5.9 (Berkeley) %G%
  */
 
+#ifndef _VIS_H_
+#define	_VIS_H_
+
 /*
  * to select alternate encoding format
  */
@@ -51,3 +54,5 @@ int	strvisx __P((char *, const char *, size_t, int));
 int	strunvis __P((char *, const char *));
 int	unvis __P((char *, char, int *, int));
 __END_DECLS
+
+#endif /* !_VIS_H_ */
diff --git a/usr/src/sys/hp300/include/varargs.h b/usr/src/sys/hp300/include/varargs.h
index c8795c0138..012b89b3ae 100644
--- a/usr/src/sys/hp300/include/varargs.h
+++ b/usr/src/sys/hp300/include/varargs.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)varargs.h	5.2 (Berkeley) %G%
+ *	@(#)varargs.h	5.3 (Berkeley) %G%
  */
 
+#ifndef _VARARGS_H_
+#define	_VARARGS_H_
+
 #include <stdarg.h>
 
 #undef	va_dcl
@@ -15,3 +18,5 @@
 #undef	va_start
 #define	va_start(ap) \
 	ap = (char *)&va_alist
+
+#endif /* !_VARARGS_H_ */
-- 
2.20.1