diff options
| author | Richard Stallman <rms@gnu.org> | 1992-10-17 07:39:31 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1992-10-17 07:39:31 +0000 |
| commit | eae92d827e25a4ea7ce36da6690c876e532ea0b9 (patch) | |
| tree | 98a8392ef904dfddf105c565d2da150802625673 /gcc | |
| parent | 037080855f27408b7284741499e676361fe2187d (diff) | |
| download | gcc-eae92d827e25a4ea7ce36da6690c876e532ea0b9.zip gcc-eae92d827e25a4ea7ce36da6690c876e532ea0b9.tar.gz gcc-eae92d827e25a4ea7ce36da6690c876e532ea0b9.tar.bz2 | |
(va_list) [__SVR4_2__]: Don't set or test _VA_LIST.
From-SVN: r2500
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ginclude/stdarg.h | 12 | ||||
| -rw-r--r-- | gcc/ginclude/varargs.h | 13 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index 85cb3a9..c93240e 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -94,6 +94,15 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */ #undef _BSD_VA_LIST #endif +#ifdef __SVR4_2__ +/* SVR4.2 uses _VA_LIST for an internal alias for va_list, + so we must avoid testing it and setting it here. */ +#ifndef _VA_LIST_ +#define _VA_LIST_ +typedef __gnuc_va_list va_list; +#endif /* _VA_LIST_ */ +#else /* not __SVR4_2__ */ + /* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ #ifndef _VA_LIST_ /* The macro _VA_LIST is used in SCO Unix 3.2. */ @@ -103,6 +112,9 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */ typedef __gnuc_va_list va_list; #endif /* _VA_LIST */ #endif /* _VA_LIST_ */ + +#endif /* not __SVR4_2__ */ + #endif /* _STDARG_H */ #endif /* __GNUC__ */ diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 7df05ae..ef2eeaf 100644 --- a/gcc/ginclude/varargs.h +++ b/gcc/ginclude/varargs.h @@ -115,6 +115,17 @@ typedef void *__gnuc_va_list; #undef _VA_LIST_ #endif +#ifdef __SVR4_2__ + +/* SVR4.2 uses _VA_LIST for an internal alias for va_list, + so we must avoid testing it and setting it here. */ +#ifndef _VA_LIST_ +#define _VA_LIST_ +typedef __gnuc_va_list va_list; +#endif /* _VA_LIST_ */ + +#else /* not __SVR4_2__ */ + /* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ #ifndef _VA_LIST_ /* The macro _VA_LIST is used in SCO Unix 3.2. */ @@ -125,6 +136,8 @@ typedef __gnuc_va_list va_list; #endif /* _VA_LIST */ #endif /* _VA_LIST_ */ +#endif /* not __SVR4_2__ */ + /* I think that in 4.3bsd-net2 there is some need to leave _VA_LIST_ undefined after. I don't know why. -- rms. */ #ifdef _ANSI_H_ |