summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--io/fcntl.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fbb602c30..46e7179c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-20 Roland McGrath <roland@hack.frob.com>
+
+ * io/fcntl.h: Move include of <bits/types.h> to the top and
+ include it unconditionally.
+
2012-10-20 H.J. Lu <hongjiu.lu@intel.com>
* wcsmbs/Makefile (tests-ifunc): New variable.
diff --git a/io/fcntl.h b/io/fcntl.h
index c7d5e6972c..81f34bfbd7 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -27,6 +27,9 @@
/* This must be early so <bits/fcntl.h> can define types winningly. */
__BEGIN_DECLS
+/* Get __mode_t, __dev_t and __off_t .*/
+#include <bits/types.h>
+
/* Get the definitions of O_*, F_*, FD_*: all the
numbers and flag bits for `open', `fcntl', et al. */
#include <bits/fcntl.h>
@@ -56,7 +59,6 @@ typedef __pid_t pid_t;
/* For XPG all symbols from <sys/stat.h> should also be available. */
#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# include <bits/types.h> /* For __mode_t and __dev_t. */
# define __need_timespec
# include <time.h>
# include <bits/stat.h>