Include <bits/stat.h> only once

diff --git a/ChangeLog b/ChangeLog
index 795be448b6f09c93e0319b8116730a2beab023a6..10db9939c99fe19a5a7590741340d2e9d32d91dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-11  Andreas Schwab  <schwab@redhat.com>
 
+       * io/fcntl.h: Only include <bits/stat.h> once.
+       * io/sys/stat.h: Likewise.
+
        * bits/confname.h: Add missing comma, remove trailing commas.
 
 2010-01-10  Ulrich Drepper  <drepper@redhat.com>

diff --git a/io/fcntl.h b/io/fcntl.h
index 4eb003be4604e48bce0c9bd19d42ffc5e45842cb..d54fcf18b2f06945bde6c43456272fc6b8cc2756 100644 (file)
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -38,7 +38,10 @@ __BEGIN_DECLS
 # include <bits/types.h>         /* For __mode_t and __dev_t.  */
 # define __need_timespec
 # include <time.h>
-# include <bits/stat.h>
+# ifndef __bits_stat_h_included
+#  include <bits/stat.h>
+#  define __bits_stat_h_included
+# endif
 
 # define S_IFMT                __S_IFMT
 # define S_IFDIR       __S_IFDIR

diff --git a/io/sys/stat.h b/io/sys/stat.h
index c21801d6a97899478e6d7c8ed6f9382175f17014..de9b5e80645a66a90f9ea08e86e6b03ba448bbc6 100644 (file)
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -104,7 +104,10 @@ typedef __blksize_t blksize_t;
 
 __BEGIN_DECLS
 
-#include <bits/stat.h>
+#ifndef __bits_stat_h_included
+# include <bits/stat.h>
+# define __bits_stat_h_included
+#endif
 
 #if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN
 # define S_IFMT                __S_IFMT