diff options
Diffstat (limited to 'gcc/ginclude/stdarg.h')
| -rw-r--r-- | gcc/ginclude/stdarg.h | 29 |
1 files changed, 7 insertions, 22 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 */ |