Fix double-inclusion problem of bits/stat.h.

diff --git a/ChangeLog b/ChangeLog
index 3992fb7..2e5a18b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-01-11  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/bsd/bits/stat.h: Fix double-inclusion problem.
+       * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
+       * sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
+       * sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
+       * sysdeps/unix/sysv/bits/stat.h: Likewise.
+       * sysdeps/mach/hurd/bits/stat.h: Likewise.
+
        * bits/confname.h: Fix typo in last change.
 
        * conform/data/unistd.h-data: lockf-constants Not needed for POSIX.

diff --git a/sysdeps/mach/hurd/bits/stat.h b/sysdeps/mach/hurd/bits/stat.h
index 3770f07..b64a658 100644 (file)
--- a/sysdeps/mach/hurd/bits/stat.h
+++ b/sysdeps/mach/hurd/bits/stat.h
@@ -21,6 +21,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 #include <bits/types.h>
 
 /* NOTE: The size of this structure (32 ints) is known in
@@ -193,5 +196,7 @@ struct stat64
 
 /* Default file creation mask (umask).  */
 #ifdef __USE_BSD
-#define        CMASK           0022
+# define CMASK         0022
 #endif
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/bsd/bits/stat.h b/sysdeps/unix/bsd/bits/stat.h
index 16e5c52..6eeab3b 100644 (file)
--- a/sysdeps/unix/bsd/bits/stat.h
+++ b/sysdeps/unix/bsd/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 #include <bits/types.h>
 
 /* Structure describing file characteristics.  */
@@ -84,3 +87,5 @@ struct stat
 #define        __S_IREAD       0400    /* Read by owner.  */
 #define        __S_IWRITE      0200    /* Write by owner.  */
 #define        __S_IEXEC       0100    /* Execute by owner.  */
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/sysv/bits/stat.h b/sysdeps/unix/sysv/bits/stat.h
index a860b9f..2fb619a 100644 (file)
--- a/sysdeps/unix/sysv/bits/stat.h
+++ b/sysdeps/unix/sysv/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 struct stat
   {
     short int st_dev;
@@ -63,3 +66,5 @@ struct stat
 #define        __S_IREAD       0400    /* Read by owner.  */
 #define        __S_IWRITE      0200    /* Write by owner.  */
 #define        __S_IEXEC       0100    /* Execute by owner.  */
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h
index e3f1970..8ac3cd4 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 /* Versions of the `struct stat' data structure.  */
 #define _STAT_VER_LINUX_OLD    1
 #define _STAT_VER_KERNEL       1
@@ -166,3 +169,5 @@ struct stat64
 # define UTIME_NOW     ((1l << 30) - 1l)
 # define UTIME_OMIT    ((1l << 30) - 2l)
 #endif
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/stat.h b/sysdeps/unix/sysv/linux/ia64/bits/stat.h
index 98dadf9..86acd27 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 /* Versions of the `struct stat' data structure.  */
 #define _STAT_VER_KERNEL       0
 #define _STAT_VER_LINUX                1
@@ -143,3 +146,5 @@ struct stat64
 # define UTIME_NOW     ((1l << 30) - 1l)
 # define UTIME_OMIT    ((1l << 30) - 2l)
 #endif
+
+#endif /* bits//stat.h */

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
index 9027376..6e4a55f 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
@@ -21,6 +21,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 #include <bits/wordsize.h>
 
 /* Versions of the `struct stat' data structure.  */
@@ -270,3 +273,5 @@ struct stat64
 # define UTIME_NOW     ((1l << 30) - 1l)
 # define UTIME_OMIT    ((1l << 30) - 2l)
 #endif
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h
index 2cd5396..9d62ad2 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 64
@@ -259,3 +262,5 @@ struct stat64
 # define UTIME_NOW     ((1l << 30) - 1l)
 # define UTIME_OMIT    ((1l << 30) - 2l)
 #endif
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/stat.h b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
index 407ca2d..eaab95a 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 /* Versions of the `struct stat' data structure.  */
 #define _STAT_VER_LINUX_OLD    1
 #define _STAT_VER_KERNEL       1
@@ -167,3 +170,5 @@ struct stat64
 # define UTIME_NOW     ((1l << 30) - 1l)
 # define UTIME_OMIT    ((1l << 30) - 2l)
 #endif
+
+#endif /* bits/stat.h */

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
index cfc3f66..c7e4e1f 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
@@ -20,6 +20,9 @@
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
 
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H   1
+
 /* Versions of the `struct stat' data structure.  */
 #define _STAT_VER_KERNEL       0
 
@@ -206,3 +209,5 @@ struct stat64
 # define UTIME_NOW     ((1l << 30) - 1l)
 # define UTIME_OMIT    ((1l << 30) - 2l)
 #endif
+
+#endif /* bits/stat.h */