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

diff --git a/include/string.h b/include/string.h
index ff9badb9..43ad0942 100644
--- a/include/string.h
+++ b/include/string.h
@@ -7,7 +7,9 @@ extern "C" {
 
 #include <features.h>
 
-#ifdef __cplusplus
+#if __cplusplus >= 201103L
+#define NULL nullptr
+#elif defined(__cplusplus)
 #define NULL 0L
 #else
 #define NULL ((void*)0)
@@ -82,13 +84,12 @@ void *memccpy (void *__restrict, const void *__restrict, int, size_t);
 char *strsep(char **, const char *);
 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);