X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fstring.h;h=43ad0942edd54c6d6ae9d52dc33f27e452aa7aa3;hb=759bf785a84bd56ed1b163594f3f66ade808c0e3;hp=33f013782a4a5fcdf7ec81c6463461352e01e7b4;hpb=c86f2974e2acd330be2d587173dd4dd56db82e22;p=musl

diff --git a/include/string.h b/include/string.h
index 33f01378..43ad0942 100644
--- a/include/string.h
+++ b/include/string.h
@@ -7,9 +7,10 @@ extern "C" {
 
 #include <features.h>
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
+#if __cplusplus >= 201103L
+#define NULL nullptr
+#elif defined(__cplusplus)
+#define NULL 0L
 #else
 #define NULL ((void*)0)
 #endif
@@ -81,18 +82,14 @@ 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);