From 0654e6be9566ff502a8754e3876c66dfdef14e2f Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje@gcc.gnu.org>
Date: Sat, 4 May 2013 10:49:59 -0400
Subject: inclhack.def (aix_null): New.

        * inclhack.def (aix_null): New.
        (void_null): Update replacement definition of NULL.
        * fixincl.x: Regenerate.
        * tests/base/curses.h: Update for new fix.

From-SVN: r198596
---
 fixincludes/tests/base/curses.h | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'fixincludes/tests')

diff --git a/fixincludes/tests/base/curses.h b/fixincludes/tests/base/curses.h
index e05f891..4a183be 100644
--- a/fixincludes/tests/base/curses.h
+++ b/fixincludes/tests/base/curses.h
@@ -9,6 +9,11 @@
 
 
 
+#if defined( AIX_NULL_CHECK )
+# define	NULL 	(0L)  /* typed NULL */
+#endif  /* AIX_NULL_CHECK */
+
+
 #if defined( AVOID_BOOL_DEFINE_CHECK )
 #ifndef __cplusplus
 # define bool	 char 
@@ -31,5 +36,15 @@ struct term;
 
 
 #if defined( VOID_NULL_CHECK )
-#define NULL 0  /* typed NULL */
+#ifndef NULL
+#ifdef __cplusplus
+#ifdef __GNUG__
+#define NULL __null
+#else /* ! __GNUG__  */
+#define NULL 0L
+#endif /* __GNUG__  */
+#else /* ! __cplusplus  */
+#define NULL ((void *)0)
+#endif /* __cplusplus  */
+#endif /* !NULL  */  /* typed NULL */
 #endif  /* VOID_NULL_CHECK */
-- 
cgit v1.1