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

diff --git a/include/string.h b/include/string.h
index 33f01378..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) \
@@ -81,9 +76,6 @@ 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);
 #endif