From 489a81a891203d9e214899ae4d91a9f12c4f950f Mon Sep 17 00:00:00 2001
From: drepper <drepper>
Date: Sat, 21 Jun 1997 00:58:43 +0000
Subject: [PATCH] Standardize the multiple-include protect.

---
 io/fcntl.h      |  6 +++---
 io/fts.h        |  6 +++---
 io/ftw.h        |  4 ++--
 io/sys/poll.h   |  4 ++--
 io/sys/stat.h   | 33 +++++++++++++++++----------------
 io/sys/statfs.h |  4 ++--
 io/utime.h      |  4 ++--
 7 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/io/fcntl.h b/io/fcntl.h
index 4e1b38a58e..519230019c 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -21,16 +21,16 @@
  */
 
 #ifndef	_FCNTL_H
-
 #define	_FCNTL_H	1
+
 #include <features.h>
 
-/* This must be early so <fcntlbits.h> can define types winningly.  */
+/* This must be early so <bits/fcntl.h> can define types winningly.  */
 __BEGIN_DECLS
 
 /* Get the definitions of O_*, F_*, FD_*: all the
    numbers and flag bits for `open', `fcntl', et al.  */
-#include <fcntlbits.h>
+#include <bits/fcntl.h>
 
 #ifdef	__USE_MISC
 #ifndef	R_OK			/* Verbatim from <unistd.h>.  Ugh.  */
diff --git a/io/fts.h b/io/fts.h
index a6548c2d79..55194db9e2 100644
--- a/io/fts.h
+++ b/io/fts.h
@@ -33,8 +33,8 @@
  *	@(#)fts.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef	_FTS_H_
-#define	_FTS_H_
+#ifndef	_FTS_H
+#define	_FTS_H 1
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
@@ -123,4 +123,4 @@ FTSENT	*fts_read __P((FTS *));
 int	 fts_set __P((FTS *, FTSENT *, int));
 __END_DECLS
 
-#endif /* !_FTS_H_ */
+#endif /* fts.h */
diff --git a/io/ftw.h b/io/ftw.h
index d283e6937e..d788b39d16 100644
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -21,12 +21,12 @@
  */
 
 #ifndef _FTW_H
-
 #define	_FTW_H	1
+
 #include <features.h>
 
 #include <sys/types.h>
-#include <statbuf.h>
+#include <bits/stat.h>
 
 
 __BEGIN_DECLS
diff --git a/io/sys/poll.h b/io/sys/poll.h
index f9880a140c..e694fe37d5 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -18,8 +18,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef	_SYS_POLL_H
-
 #define	_SYS_POLL_H	1
+
 #include <features.h>
 
 __BEGIN_DECLS
@@ -64,4 +64,4 @@ extern int poll __P ((struct pollfd *__fds, unsigned long int __nfds,
 
 __END_DECLS
 
-#endif	/* _SYS_POLL_H */
+#endif	/* sys/poll.h */
diff --git a/io/sys/stat.h b/io/sys/stat.h
index f51c56aabd..5485976ca6 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -21,15 +21,15 @@
  */
 
 #ifndef	_SYS_STAT_H
-
 #define	_SYS_STAT_H	1
+
 #include <features.h>
 
-#include <gnu/types.h>		/* For __mode_t and __dev_t.  */
+#include <bits/types.h>		/* For __mode_t and __dev_t.  */
 
 __BEGIN_DECLS
 
-#include <statbuf.h>
+#include <bits/stat.h>
 
 #if defined(__USE_BSD) || defined(__USE_MISC)
 #define	S_IFMT		__S_IFMT
@@ -173,19 +173,20 @@ extern int mknod __P ((__const char *__path,
 /* Create a new FIFO named PATH, with permission bits MODE.  */
 extern int mkfifo __P ((__const char *__path, __mode_t __mode));
 
-/* To allow the `struct stat' structure and the file type `mode_t' bits to
-   vary without changing shared library major version number, the `stat'
-   family of functions and `mknod' are in fact inline wrappers around calls
-   to `xstat', `fxstat', `lxstat', and `xmknod', which all take a leading
-   version-number argument designating the data structure and bits used.
-   <statbuf.h> defines _STAT_VER with the version number corresponding to
-   `struct stat' as defined in that file; and _MKNOD_VER with the version
-   number corresponding to the S_IF* macros defined therein.  It is
-   arranged that when not inlined these function are always statically
-   linked; that way a dynamically-linked executable always encodes the
-   version number corresponding to the data structures it uses, so the `x'
-   functions in the shared library can adapt without needing to recompile
-   all callers.  */
+/* To allow the `struct stat' structure and the file type `mode_t'
+   bits to vary without changing shared library major version number,
+   the `stat' family of functions and `mknod' are in fact inline
+   wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod',
+   which all take a leading version-number argument designating the
+   data structure and bits used.  <bits/stat.h> defines _STAT_VER with
+   the version number corresponding to `struct stat' as defined in
+   that file; and _MKNOD_VER with the version number corresponding to
+   the S_IF* macros defined therein.  It is arranged that when not
+   inlined these function are always statically linked; that way a
+   dynamically-linked executable always encodes the version number
+   corresponding to the data structures it uses, so the `x' functions
+   in the shared library can adapt without needing to recompile all
+   callers.  */
 
 #ifndef _STAT_VER
 #define _STAT_VER	0
diff --git a/io/sys/statfs.h b/io/sys/statfs.h
index 4871e50723..49c154d216 100644
--- a/io/sys/statfs.h
+++ b/io/sys/statfs.h
@@ -18,12 +18,12 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef	_SYS_STATFS_H
-
 #define	_SYS_STATFS_H	1
+
 #include <features.h>
 
 /* Get the system-specific definition of `struct statfs'.  */
-#include <statfsbuf.h>
+#include <bits/statfs.h>
 
 __BEGIN_DECLS
 
diff --git a/io/utime.h b/io/utime.h
index 7ab772b042..7cb4724f93 100644
--- a/io/utime.h
+++ b/io/utime.h
@@ -21,13 +21,13 @@
  */
 
 #ifndef	_UTIME_H
-
 #define	_UTIME_H	1
+
 #include <features.h>
 
 __BEGIN_DECLS
 
-#include <gnu/types.h>
+#include <bits/types.h>
 
 /* Structure describing file times.  */
 struct utimbuf
-- 
2.11.0