diff options
| author | David Edelsohn <dje@gcc.gnu.org> | 2013-05-04 10:49:59 -0400 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2013-05-04 10:49:59 -0400 |
| commit | 0654e6be9566ff502a8754e3876c66dfdef14e2f (patch) | |
| tree | fb2829d7008afaf98b795228050ea04dc0b30341 /fixincludes/tests | |
| parent | 40de22d6f926dadb38c5b6cf46703843e3d2d1e7 (diff) | |
| download | gcc-0654e6be9566ff502a8754e3876c66dfdef14e2f.zip gcc-0654e6be9566ff502a8754e3876c66dfdef14e2f.tar.gz gcc-0654e6be9566ff502a8754e3876c66dfdef14e2f.tar.bz2 | |
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
Diffstat (limited to 'fixincludes/tests')
| -rw-r--r-- | fixincludes/tests/base/curses.h | 17 |
1 files changed, 16 insertions, 1 deletions
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 */ |