From 5da07ba3ac82ad71597205a0357aede7dd897ff8 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@yorick.cygnus.com>
Date: Thu, 30 Oct 1997 06:00:21 +0000
Subject: [PATCH] * gen-params: Override NULL.

From-SVN: r16232
---
 libio/ChangeLog  | 4 ++++
 libio/gen-params | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/libio/ChangeLog b/libio/ChangeLog
index 6da6b9c5b911..ba7c23613e21 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 29 23:01:47 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* gen-params: Override NULL.
+
 Wed Oct 22 19:19:32 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
 
 	* libio.h (_IO_LOCK_T): Handle glibc 2 when _IO_MTSAFE_IO is
diff --git a/libio/gen-params b/libio/gen-params
index c6eb7d30fd8c..c97edbcb6bc0 100755
--- a/libio/gen-params
+++ b/libio/gen-params
@@ -711,6 +711,13 @@ fi
 # Uncomment the following line if you don't have working templates.
 # echo "#define ${macro_prefix}NO_TEMPLATES"
 
+# Override bogus definitions of NULL in system headers.
+cat <<EOF
+#undef NULL
+#define __need_NULL
+#include <stddef.h>
+EOF
+
 rm -f dummy.C dummy.o dummy.c dummy.out TMP core a.out
 
 echo "#endif /* !${macro_prefix}config_h */"
-- 
2.47.2