X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flocale.h;h=11106fea878a698dff0b0595dcb16dc2b97571a4;hb=759bf785a84bd56ed1b163594f3f66ade808c0e3;hp=f6a29b2ad014efeb9cdd4965c29f6e1e5f4199d1;hpb=41d7c77d6a2e74294807d35062e4cd1d48ab72d3;p=musl

diff --git a/include/locale.h b/include/locale.h
index f6a29b2a..11106fea 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -7,7 +7,13 @@ extern "C" {
 
 #include <features.h>
 
+#if __cplusplus >= 201103L
+#define NULL nullptr
+#elif defined(__cplusplus)
 #define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
 
 #define LC_CTYPE    0
 #define LC_NUMERIC  1
@@ -51,7 +57,7 @@ struct lconv *localeconv(void);
 
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
 #define __NEED_locale_t