From de1e3bb2c95d1e3a592973a7721e1163a0517152 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 1 Nov 2012 11:51:12 +0000
Subject: [PATCH] 	* libc/include/locale.h (NULL): Fetch definition via
 stddef.h. 	* libc/include/stdio.h (NULL): Ditto. 	*
 libc/include/stdlib.h (NULL): Ditto. 	* libc/include/string.h (NULL): Ditto.
 	* libc/include/wchar.h (NULL): Ditto. 	* libc/include/rpc/types.h
 (NULL): Ditto. 	* libc/include/time.h (NULL): Ditto.  Include stddef.h
 earlier.

---
 newlib/ChangeLog                | 10 ++++++++++
 newlib/libc/include/locale.h    |  5 ++---
 newlib/libc/include/rpc/types.h |  6 +++---
 newlib/libc/include/stdio.h     |  5 +----
 newlib/libc/include/stdlib.h    |  5 +----
 newlib/libc/include/string.h    |  5 +----
 newlib/libc/include/time.h      |  8 +++-----
 newlib/libc/include/wchar.h     |  5 +----
 8 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2cc87ac1d..30bf3e4f9 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,13 @@
+2012-11-01  Corinna Vinschen  <vinschen@redhat.com>
+
+	* libc/include/locale.h (NULL): Fetch definition via stddef.h.
+	* libc/include/stdio.h (NULL): Ditto.
+	* libc/include/stdlib.h (NULL): Ditto.
+	* libc/include/string.h (NULL): Ditto.
+	* libc/include/wchar.h (NULL): Ditto.
+	* libc/include/rpc/types.h (NULL): Ditto.
+	* libc/include/time.h (NULL): Ditto.  Include stddef.h earlier.
+
 2012-10-27  Anthony Green  <green@moxielogic.com>
 
 	* libc/machine/moxie/setjmp.S (setjmp): Minor optimization.
diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index fa5c270fc..cbd658e41 100644
--- a/newlib/libc/include/locale.h
+++ b/newlib/libc/include/locale.h
@@ -9,9 +9,8 @@
 
 #include "_ansi.h"
 
-#ifndef NULL
-#define NULL    0
-#endif
+#define __need_NULL
+#include <stddef.h>
 
 #define LC_ALL	    0
 #define LC_COLLATE  1
diff --git a/newlib/libc/include/rpc/types.h b/newlib/libc/include/rpc/types.h
index 7bb8c997b..df77a935a 100644
--- a/newlib/libc/include/rpc/types.h
+++ b/newlib/libc/include/rpc/types.h
@@ -41,6 +41,9 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#define __need_NULL
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -59,9 +62,6 @@ typedef u_int32_t rpcprot_t;
 typedef u_int32_t rpcport_t;
 typedef   int32_t rpc_inline_t;
 
-#ifndef NULL
-# define NULL 0
-#endif
 #define __dontcare__ -1
 
 #ifndef FALSE
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 305e409b8..534719aff 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -31,6 +31,7 @@
 #define	_FSTDIO			/* ``function stdio'' */
 
 #define __need_size_t
+#define __need_NULL
 #include <stddef.h>
 
 #define __need___va_list
@@ -96,10 +97,6 @@ typedef _fpos64_t fpos64_t;
 #define	_IOLBF	1		/* setvbuf should set line buffered */
 #define	_IONBF	2		/* setvbuf should set unbuffered */
 
-#ifndef NULL
-#define	NULL	0
-#endif
-
 #define	EOF	(-1)
 
 #ifdef __BUFSIZ__
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index c3cb55203..5340e364b 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -12,6 +12,7 @@
 
 #define __need_size_t
 #define __need_wchar_t
+#define __need_NULL
 #include <stddef.h>
 
 #include <sys/reent.h>
@@ -46,10 +47,6 @@ typedef struct
 } lldiv_t;
 #endif
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
 
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index fad0ef3d0..f9217f5f0 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -13,12 +13,9 @@
 #include <sys/features.h>
 
 #define __need_size_t
+#define __need_NULL
 #include <stddef.h>
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 _BEGIN_STD_C
 
 _PTR 	 _EXFUN(memchr,(const _PTR, int, size_t));
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 306bad619..c760297f9 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -10,9 +10,9 @@
 #include "_ansi.h"
 #include <sys/reent.h>
 
-#ifndef NULL
-#define	NULL	0
-#endif
+#define __need_size_t
+#define __need_NULL
+#include <stddef.h>
 
 /* Get _CLOCKS_PER_SEC_ */
 #include <machine/time.h>
@@ -23,8 +23,6 @@
 
 #define CLOCKS_PER_SEC _CLOCKS_PER_SEC_
 #define CLK_TCK CLOCKS_PER_SEC
-#define __need_size_t
-#include <stddef.h>
 
 #include <sys/types.h>
 
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index 3cb12e25f..f9e623774 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -8,6 +8,7 @@
 #define __need_size_t
 #define __need_wchar_t
 #define __need_wint_t
+#define __need_NULL
 #include <stddef.h>
 
 #define __need___va_list
@@ -19,10 +20,6 @@
 /* For __STDC_ISO_10646__ */
 #include <sys/features.h>
 
-#ifndef NULL
-#define NULL	0
-#endif
-
 #ifndef WEOF
 # define WEOF ((wint_t)-1)
 #endif