summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/locale.h7
-rw-r--r--include/stddef.h7
-rw-r--r--include/stdio.h7
-rw-r--r--include/stdlib.h7
-rw-r--r--include/string.h7
-rw-r--r--include/time.h8
-rw-r--r--include/unistd.h7
-rw-r--r--include/wchar.h7
8 files changed, 8 insertions, 49 deletions
diff --git a/include/locale.h b/include/locale.h
index c6cc1ec7..f6a29b2a 100644
--- a/include/locale.h
+++ b/include/locale.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 LC_CTYPE 0
#define LC_NUMERIC 1
diff --git a/include/stddef.h b/include/stddef.h
index a5bb9ecc..9d522486 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,12 +1,7 @@
#ifndef _STDDEF_H
#define _STDDEF_H
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
#define __NEED_ptrdiff_t
#define __NEED_size_t
diff --git a/include/stdio.h b/include/stdio.h
index 645e6221..f6488017 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -20,12 +20,7 @@ extern "C" {
#include <bits/alltypes.h>
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
#undef EOF
#define EOF (-1)
diff --git a/include/stdlib.h b/include/stdlib.h
index 2d1505b5..671d188f 100644
--- a/include/stdlib.h
+++ b/include/stdlib.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
#define __NEED_wchar_t
diff --git a/include/string.h b/include/string.h
index c2f8eb55..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) \
diff --git a/include/time.h b/include/time.h
index fbc47db9..4a681b4a 100644
--- a/include/time.h
+++ b/include/time.h
@@ -7,13 +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
#define __NEED_time_t
diff --git a/include/unistd.h b/include/unistd.h
index 89015ad6..07e49e97 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -15,12 +15,7 @@ extern "C" {
#define SEEK_CUR 1
#define SEEK_END 2
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
#define __NEED_size_t
#define __NEED_ssize_t
diff --git a/include/wchar.h b/include/wchar.h
index 35706c7f..9ceddd57 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -26,12 +26,7 @@ extern "C" {
#include <bits/wchar.h>
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
#undef WEOF
#define WEOF (-1)