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

diff --git a/include/string.h b/include/string.h
index 33f01378..ff9badb9 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,9 +80,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