From: Andreas Schwab <schwab@redhat.com>
Date: Mon, 11 Jan 2010 10:19:01 +0000 (+0100)
Subject: Include <bits/stat.h> only once
X-Git-Tag: fedora/glibc-2.11.90-7~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee1283c60d2ce22a3e17bff4b83b6b7f26f4ba0;p=thirdparty%2Fglibc.git

Include <bits/stat.h> only once
---

diff --git a/ChangeLog b/ChangeLog
index 795be448b6f..10db9939c99 100644
--- 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 4eb003be460..d54fcf18b2f 100644
--- 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 c21801d6a97..de9b5e80645 100644
--- 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