[git commit] ftw.c: errno.h has to be included before undefining _LIBC
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:34 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=ef304f14b38a40531af4abd5cd4703cb3483be88
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
While, cleanup a bit
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
libc/misc/ftw/ftw.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 9031e35..20ff4f0 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 ();
More information about the uClibc-cvs
mailing list