aboutsummaryrefslogtreecommitdiff
path: root/gcc/ginclude/varargs.h
diff options
context:
space:
mode:
authorRichard Kenner <kenner@gcc.gnu.org>1997-06-22 06:29:26 -0400
committerRichard Kenner <kenner@gcc.gnu.org>1997-06-22 06:29:26 -0400
commit1997cb46f73354ff969abdd7d79f48e00d99c19d (patch)
tree0fcf8fbca242d2ab716df7eb15a49d2654b56f02 /gcc/ginclude/varargs.h
parent8458d268d21eecd9c45e4c380ec78a51b6858bd1 (diff)
downloadgcc-1997cb46f73354ff969abdd7d79f48e00d99c19d.zip
gcc-1997cb46f73354ff969abdd7d79f48e00d99c19d.tar.gz
gcc-1997cb46f73354ff969abdd7d79f48e00d99c19d.tar.bz2
Protect va_list definition from SCO headers.
From-SVN: r14286
Diffstat (limited to 'gcc/ginclude/varargs.h')
-rw-r--r--gcc/ginclude/varargs.h5
1 files changed, 4 insertions, 1 deletions
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 */