diff options
| author | Richard Stallman <rms@gnu.org> | 1992-11-10 15:27:21 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1992-11-10 15:27:21 +0000 |
| commit | 5ce402b71dda6acf9d2cfa1c6810df2455c10118 (patch) | |
| tree | b8d9fb717bd9444399b3fea331f6ed9e791f53b4 /gcc/ginclude | |
| parent | ca2ece1b4542c4e2d38c83a5b0e2fde7b7717f96 (diff) | |
| download | gcc-5ce402b71dda6acf9d2cfa1c6810df2455c10118.zip gcc-5ce402b71dda6acf9d2cfa1c6810df2455c10118.tar.gz gcc-5ce402b71dda6acf9d2cfa1c6810df2455c10118.tar.bz2 | |
Don't test, define or undef _VA_LIST_ on NET 2 systems. Don't include ansi.h.
From-SVN: r2736
Diffstat (limited to 'gcc/ginclude')
| -rw-r--r-- | gcc/ginclude/stdarg.h | 29 | ||||
| -rw-r--r-- | gcc/ginclude/varargs.h | 29 |
2 files changed, 14 insertions, 44 deletions
diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index d44cf9e..4ee9bb9 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -105,36 +105,21 @@ typedef __gnuc_va_list va_list; #endif /* _VA_LIST_ */ #else /* not __SVR4_2__ */ -/* On 4.3bsd-net2, make sure ansi.h is included, so we have - one less case to deal with in the following. */ -#if defined (__BSD_NET2__) || defined (____386BSD____) -#include <ansi.h> -#endif - -/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which remain - defined as long as the corresponding type is *not* defined. */ -#ifdef _ANSI_H_ -#ifndef _VA_LIST_ -#define _VA_LIST -#endif -#undef _VA_LIST_ -#endif /* _ANSI_H_ */ - -/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ -#ifndef _VA_LIST_ +/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. + But on BSD NET2 we must not test or define or undef it. + (Note that the comments in NET 2's ansi.h + are incorrect for _VA_LIST_--see stdio.h!) */ +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST +#if !(defined (__BSD_NET2__) || defined (____386BSD____)) #define _VA_LIST_ +#endif #define _VA_LIST typedef __gnuc_va_list va_list; #endif /* not _VA_LIST */ #endif /* not _VA_LIST_ */ -/* On 4.3bsd-net2, leave _VA_LIST_ undef to indicate va_list is defined. */ -#ifdef _ANSI_H_ -#undef _VA_LIST_ -#endif - #endif /* not __SVR4_2__ */ #endif /* _STDARG_H */ diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 971aba6..b04dced 100644 --- a/gcc/ginclude/varargs.h +++ b/gcc/ginclude/varargs.h @@ -119,26 +119,16 @@ typedef __gnuc_va_list va_list; #else /* not __SVR4_2__ */ -/* On 4.3bsd-net2, make sure ansi.h is included, so we have - one less case to deal with in the following. */ -#if defined (__BSD_NET2__) || defined (____386BSD____) -#include <ansi.h> -#endif - -/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which remain - defined as long as the corresponding type is *not* defined. */ -#ifdef _ANSI_H_ -#ifndef _VA_LIST_ -#define _VA_LIST -#endif -#undef _VA_LIST_ -#endif /* _ANSI_H_ */ - -/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ -#ifndef _VA_LIST_ +/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. + But on BSD NET2 we must not test or define or undef it. + (Note that the comments in NET 2's ansi.h + are incorrect for _VA_LIST_--see stdio.h!) */ +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST +#if !(defined (__BSD_NET2__) || defined (____386BSD____)) #define _VA_LIST_ +#endif #define _VA_LIST typedef __gnuc_va_list va_list; #endif /* not _VA_LIST */ @@ -146,11 +136,6 @@ typedef __gnuc_va_list va_list; #endif /* not __SVR4_2__ */ -/* On 4.3bsd-net2, leave _VA_LIST_ undef to indicate va_list is defined. */ -#ifdef _ANSI_H_ -#undef _VA_LIST_ -#endif - /* The next BSD release (if there is one) wants this symbol to be undefined instead of _VA_LIST_. */ #ifdef _BSD_VA_LIST |