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

diff --git a/ChangeLog b/ChangeLog
index 3992fb77c8cc4cef65c91ef8807b56ce4d3b8490..2e5a18bfe85746d72e05ac278759b61f5a2d7870 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 3770f071de61271b7ec0b1f48904effd3002e081..b64a658fbda723d9c3f2cbd263581b709fb99421 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 16e5c520fe7448f2385537c5c602fa90a41f1a1f..6eeab3b0ee6fb016aeb5a896ea8e6a41a8b38ded 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 a860b9fe8aaded4870c123d20341eadb55d4a441..2fb619a2e4b6f9a3b85d9060f8658f3849117e5c 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 e3f1970086f70317e877324f02d6bed4c3dd489d..8ac3cd47266b7325f3f522a99c4e7ef2f75e5109 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 98dadf9984cce94e57ababc1ee4148b286e237a2..86acd27ae2077a17b2fe9b890c64dfa879f73a7e 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 90273769796741949269be9c578c642dc2e5e452..6e4a55f87a404cbaf7e24310a64233f4d15dfd88 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 2cd5396eaa967e2ccc7bd60ff1d67ed4e6ed0601..9d62ad26f5cbd8a1670413f9920ee4efe7e4fa40 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 407ca2d7b5e86fc3aba70749237b8782c70fbf94..eaab95a1cb8c7cce593d0db8e98bffe5e71dd375 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 cfc3f665dc93b662df51e13d21c01bb310a61c45..c7e4e1f0d4abad65f63b587ccfc2ac94c3d5bf28 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 */