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

[musl] / include / strings.h

diff --git a/include/strings.h b/include/strings.h
index 059e330..2b7e086 100644 (file)
--- a/include/strings.h
+++ b/include/strings.h
@@ -5,30 +5,29 @@
 extern "C" {
 #endif
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
-
 
 #define __NEED_size_t
+#define __NEED_locale_t
 #include <bits/alltypes.h>
 
-
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \
+ || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \
+ || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
 int bcmp (const void *, const void *, size_t);
 void bcopy (const void *, void *, size_t);
 void bzero (void *, size_t);
-
-int ffs (int);
-
 char *index (const char *, int);
 char *rindex (const char *, int);
+#endif
+
+int ffs (int);
 
 int strcasecmp (const char *, const char *);
 int strncasecmp (const char *, const char *, size_t);
 
+int strcasecmp_l (const char *, const char *, locale_t);
+int strncasecmp_l (const char *, const char *, size_t, locale_t);
+
 #ifdef __cplusplus
 }
 #endif