diff options
| author | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-04 14:49:59 +0000 |
|---|---|---|
| committer | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-04 14:49:59 +0000 |
| commit | 3c47853b2d46494c8a017b0ffcc3684d896cd713 (patch) | |
| tree | fb2829d7008afaf98b795228050ea04dc0b30341 /fixincludes/tests/base | |
| parent | fd304a932522a0d854fbe316429753f001e5b7de (diff) | |
| download | ppe42-gcc-3c47853b2d46494c8a017b0ffcc3684d896cd713.tar.gz ppe42-gcc-3c47853b2d46494c8a017b0ffcc3684d896cd713.zip | |
* inclhack.def (aix_null): New.
(void_null): Update replacement definition of NULL.
* fixincl.x: Regenerate.
* tests/base/curses.h: Update for new fix.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198596 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/tests/base')
| -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 e05f8912d72..4a183be632e 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 */ |
