simplify some logic in scanf and remove redundant invalid-format check

[musl] / include / ftw.h

diff --git a/include/ftw.h b/include/ftw.h
index ffbddfa..c8eadbc 100644 (file)
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -5,9 +5,7 @@
 extern "C" {
 #endif
 
-/* Normally we do not nest header includes. However useless bloat
- * like ftw may be treated as a special case. Otherwise we would
- * have to deal with duplicating all the stat.h mess. */
+#include <features.h>
 #include <sys/stat.h>
 
 #define FTW_F   1
@@ -32,7 +30,7 @@ struct FTW
 int ftw(const char *, int (*)(const char *, const struct stat *, int), int);
 int nftw(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int);
 
-#ifdef _LARGEFILE64_SOURCE
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
 #define ftw64 ftw
 #define nftw64 nftw
 #endif