diff options
| author | Richard Stallman <rms@gnu.org> | 1992-10-30 09:38:54 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1992-10-30 09:38:54 +0000 |
| commit | 36228d08f2e062fcbaf6038b4e8e827ee022b5b2 (patch) | |
| tree | 690c00a17f5f0bb5e4af2f4609af75911cd97e2c /gcc | |
| parent | 4c3a130a92aa437cbaba0df1c49744cc8c5999af (diff) | |
| download | gcc-36228d08f2e062fcbaf6038b4e8e827ee022b5b2.zip gcc-36228d08f2e062fcbaf6038b4e8e827ee022b5b2.tar.gz gcc-36228d08f2e062fcbaf6038b4e8e827ee022b5b2.tar.bz2 | |
On Net 2 system, don't test, define or undef _VA_LIST_.
Use _ANSI_H_, __BSD_NET2__ and ____386BSD____ to test for this.
From-SVN: r2658
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ginclude/stdarg.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index 33dd5ec..9b9b301 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -4,10 +4,10 @@ Thus, va_arg (..., short) is not valid. */ #ifndef _STDARG_H -#ifndef _ANSI_STDARG_H +#ifndef _ANSI_STDARG_H_ #ifndef __need___va_list #define _STDARG_H -#define _ANSI_STDARG_H +#define _ANSI_STDARG_H_ #endif /* not __need___va_list */ #undef __need___va_list @@ -106,19 +106,24 @@ typedef __gnuc_va_list va_list; #else /* not __SVR4_2__ */ /* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ -#ifndef _VA_LIST_ +/* However, 4.3bsd-net2 uses it in a completely different way. + So if we are in 4.3bsd-net2, pay no attention to _VA_LIST_. */ +#if ! defined (_VA_LIST_) || defined (_ANSI_H_) || defined (__BSD_NET2__) || defined (____386BSD____) /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST +#if !(defined (_ANSI_H_) || defined (__BSD_NET2__) || defined (____386BSD____)) + /* Don't mess with _VA_LIST_ at all, on 4.3bsd-net2. */ #define _VA_LIST_ +#endif /* not net2 */ #define _VA_LIST typedef __gnuc_va_list va_list; -#endif /* _VA_LIST */ -#endif /* _VA_LIST_ */ +#endif /* not _VA_LIST */ +#endif /* not _VA_LIST_ (or _ANSI_H_) */ #endif /* not __SVR4_2__ */ #endif /* _STDARG_H */ #endif /* __GNUC__ */ -#endif /* not _ANSI_STDARG_H */ +#endif /* not _ANSI_STDARG_H_ */ #endif /* not _STDARG_H */ |