X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fstring.h;h=795a2abcd990ac1ecd3b7592d6948b897ec9cb68;hb=827aa8fbcac89a63c6efb986871663861500cd13;hp=3a0868b74694aa4e750804d400baeda69014e459;hpb=e2f6a3257e256ac26a755fb58290ceb1b839fa20;p=musl

diff --git a/include/string.h b/include/string.h
index 3a0868b7..795a2abc 100644
--- a/include/string.h
+++ b/include/string.h
@@ -7,9 +7,8 @@ extern "C" {
 
 #include <features.h>
 
-#undef NULL
 #ifdef __cplusplus
-#define NULL 0
+#define NULL 0L
 #else
 #define NULL ((void*)0)
 #endif
@@ -81,20 +80,17 @@ void *memccpy (void *__restrict, const void *__restrict, int, size_t);
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 char *strsep(char **, const char *);
-#endif
-
-#ifdef _BSD_SOURCE
 size_t strlcat (char *, const char *, size_t);
 size_t strlcpy (char *, const char *, size_t);
+void explicit_bzero (void *, size_t);
 #endif
 
 #ifdef _GNU_SOURCE
 #define	strdupa(x)	strcpy(alloca(strlen(x)+1),x)
 int strverscmp (const char *, const char *);
-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 *);
+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