about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-02-28 15:00:25 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2012-02-28 15:02:02 +0100
commit450bf206b4eba7e2288bc6c6e487f60e26165dce (patch)
tree0901c13e5e3809e35c77402790ee59fd6559b5f6
parent741a235bf611dd5ea646c918ac98ae5b2a0afe51 (diff)
downloadglibc-450bf206b4eba7e2288bc6c6e487f60e26165dce.tar.gz
glibc-450bf206b4eba7e2288bc6c6e487f60e26165dce.tar.xz
glibc-450bf206b4eba7e2288bc6c6e487f60e26165dce.zip
Include <dirstream.h> before <dirent/dirent.h>
-rw-r--r--ChangeLog5
-rw-r--r--include/dirent.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d3de2fce7..a1a6c50d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* include/dirent.h: Include <dirstream.h> before
+	<dirent/dirent.h>.
+
 2012-02-28  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc32/fpu/s_copysign.S: New file.
diff --git a/include/dirent.h b/include/dirent.h
index 2e88005e00..8e4823ce73 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,7 +1,9 @@
 #ifndef _DIRENT_H
+# ifndef _ISOMAC
+#  include <dirstream.h>
+# endif
 # include <dirent/dirent.h>
 # ifndef _ISOMAC
-# include <dirstream.h>
 # include <sys/stat.h>
 # include <stdbool.h>