X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flocale.h;h=11106fea878a698dff0b0595dcb16dc2b97571a4;hb=1d5750b95c06913a1f18a995481276d698d20fae;hp=702302378c5aaf0afbe74c38653c84ba433a9260;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/include/locale.h b/include/locale.h
index 70230237..11106fea 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -5,9 +5,12 @@
 extern "C" {
 #endif
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
+#include <features.h>
+
+#if __cplusplus >= 201103L
+#define NULL nullptr
+#elif defined(__cplusplus)
+#define NULL 0L
 #else
 #define NULL ((void*)0)
 #endif
@@ -53,7 +56,8 @@ char *setlocale (int, const char *);
 struct lconv *localeconv(void);
 
 
-#if 1
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
 #define __NEED_locale_t