projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix swprintf handling of nul character in output
[musl]
/
include
/
locale.h
diff --git
a/include/locale.h
b/include/locale.h
index
9da4726
..
11106fe
100644
(file)
--- a/
include/locale.h
+++ b/
include/locale.h
@@
-5,9
+5,12
@@
extern "C" {
#endif
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
#else
#define NULL ((void*)0)
#endif
@@
-54,7
+57,7
@@
struct lconv *localeconv(void);
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
#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
#define __NEED_locale_t