summaryrefslogtreecommitdiff
path: root/libc/misc/ftw
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-27 01:39:39 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:34 +0200
commitef304f14b38a40531af4abd5cd4703cb3483be88 (patch)
tree9c65cca7d67d9372003300ee64645544d73071ba /libc/misc/ftw
parentf6ad32f8953f5043e3a1dd987f5a5fff5e2e46f3 (diff)
ftw.c: errno.h has to be included before undefining _LIBC
While, cleanup a bit Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/misc/ftw')
-rw-r--r--libc/misc/ftw/ftw.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 9031e3589..20ff4f02b 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -23,6 +23,8 @@
#endif
#include <features.h>
+/* need errno.h before undefining _LIBC */
+#include <errno.h>
#ifdef __UCLIBC__
#undef _LIBC
#define HAVE_DIRENT_H 1
@@ -32,6 +34,7 @@
#endif
#if __GNUC__
+# undef alloca
# define alloca __builtin_alloca
#else
# if HAVE_ALLOCA_H
@@ -67,7 +70,6 @@ char *alloca ();
# endif
#endif
-#include <errno.h>
#include <ftw.h>
#include <limits.h>
#include <search.h>
@@ -77,11 +79,7 @@ char *alloca ();
#if HAVE_SYS_PARAM_H || defined _LIBC
# include <sys/param.h>
#endif
-#ifdef _LIBC
-# include <include/sys/stat.h>
-#else
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#if !defined _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy
char *stpcpy ();