X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fstring.h;h=ff9badb9c307fc687c18d53c3ed64a64aacdcabd;hb=976bb28fa0f5b6d82055502c27444ac5c9bf34ed;hp=f96f71ee0b5731fcc869bf00efca589efc8c4c95;hpb=400c5e5c8307a2ebe44ef1f203f5a15669f20347;p=musl

diff --git a/include/string.h b/include/string.h
index f96f71ee..ff9badb9 100644
--- a/include/string.h
+++ b/include/string.h
@@ -5,15 +5,10 @@
 extern "C" {
 #endif
 
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
+#include <features.h>
 
-#undef NULL
 #ifdef __cplusplus
-#define NULL 0
+#define NULL 0L
 #else
 #define NULL ((void*)0)
 #endif
@@ -83,7 +78,8 @@ size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t);
 void *memccpy (void *__restrict, const void *__restrict, int, size_t);
 #endif
 
-#ifdef _BSD_SOURCE
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+char *strsep(char **, const char *);
 size_t strlcat (char *, const char *, size_t);
 size_t strlcpy (char *, const char *, size_t);
 #endif
@@ -95,7 +91,7 @@ int strcasecmp_l (const char *, const char *, locale_t);
 int strncasecmp_l (const char *, const char *, size_t, locale_t);
 char *strchrnul(const char *, int);
 char *strcasestr(const char *, const char *);
-char *strsep(char **, const char *);
+void *memmem(const void *, size_t, const void *, size_t);
 void *memrchr(const void *, int, size_t);
 void *mempcpy(void *, const void *, size_t);
 #ifndef __cplusplus