diff options
| author | Richard Kenner <kenner@gcc.gnu.org> | 1997-06-22 06:29:26 -0400 |
|---|---|---|
| committer | Richard Kenner <kenner@gcc.gnu.org> | 1997-06-22 06:29:26 -0400 |
| commit | 1997cb46f73354ff969abdd7d79f48e00d99c19d (patch) | |
| tree | 0fcf8fbca242d2ab716df7eb15a49d2654b56f02 | |
| parent | 8458d268d21eecd9c45e4c380ec78a51b6858bd1 (diff) | |
| download | gcc-1997cb46f73354ff969abdd7d79f48e00d99c19d.zip gcc-1997cb46f73354ff969abdd7d79f48e00d99c19d.tar.gz gcc-1997cb46f73354ff969abdd7d79f48e00d99c19d.tar.bz2 | |
Protect va_list definition from SCO headers.
From-SVN: r14286
| -rw-r--r-- | gcc/ginclude/stdarg.h | 5 | ||||
| -rw-r--r-- | gcc/ginclude/varargs.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index adb22fb..7d39373 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -136,7 +136,7 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */ #undef _BSD_VA_LIST #endif -#if defined(__svr4__) || defined(_SCO_DS) +#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) /* SVR4.2 uses _VA_LIST for an internal alias for va_list, so we must avoid testing it and setting it here. SVR4 uses _VA_LIST as a flag in stdarg.h, but we should @@ -149,6 +149,9 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */ #endif #endif /* __i860__ */ typedef __gnuc_va_list va_list; +#ifdef _SCO_DS +#define __VA_LIST +#endif #endif /* _VA_LIST_ */ #else /* not __svr4__ || _SCO_DS */ diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 3630cc0..29587aa 100644 --- a/gcc/ginclude/varargs.h +++ b/gcc/ginclude/varargs.h @@ -146,7 +146,7 @@ typedef void *__gnuc_va_list; #undef _VA_LIST #endif -#if defined(__svr4__) || defined(_SCO_DS) +#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) /* SVR4.2 uses _VA_LIST for an internal alias for va_list, so we must avoid testing it and setting it here. SVR4 uses _VA_LIST as a flag in stdarg.h, but we should @@ -159,6 +159,9 @@ typedef void *__gnuc_va_list; #endif #endif /* __i860__ */ typedef __gnuc_va_list va_list; +#ifdef _SCO_DS +#define __VA_LIST +#endif #endif /* _VA_LIST_ */ #else /* not __svr4__ || _SCO_DS */ |