X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fstring.h;h=d44123332753313f4426c136b5330325552e06e1;hp=5587c8805319807e7d962fd53a11541417c4f7fd;hb=43653c1250ad5eb5385d7e08292ad047420f8d25;hpb=c1a9658bd19245ff0fb52d3da567815d822fb622

diff --git a/include/string.h b/include/string.h
index 5587c880..d4412333 100644
--- a/include/string.h
+++ b/include/string.h
@@ -7,12 +7,7 @@ extern "C" {
 
 #include <features.h>
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
 
 #define __NEED_size_t
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
@@ -79,7 +74,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
@@ -91,7 +87,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