[__svr4__ __i860__]: Define _VA_LIST only if not defined already.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@4486 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h
index 986240b..dfa734b 100644 (file)
--- a/gcc/ginclude/stdarg.h
+++ b/gcc/ginclude/stdarg.h
@@ -120,8 +120,10 @@ void va_end (__gnuc_va_list);              /* Defined in libgcc.a */
 #ifndef _VA_LIST_
 #define _VA_LIST_
 #ifdef __i860__
+#ifndef _VA_LIST
 #define _VA_LIST va_list
 #endif
+#endif /* __i860__ */
 typedef __gnuc_va_list va_list;
 #endif /* _VA_LIST_ */
 #else /* not __svr4__ */

diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h
index 7e92ba3..d0ebba2 100644 (file)
--- a/gcc/ginclude/varargs.h
+++ b/gcc/ginclude/varargs.h
@@ -130,8 +130,10 @@ typedef void *__gnuc_va_list;
 #ifndef _VA_LIST_
 #define _VA_LIST_
 #ifdef __i860__
+#ifndef _VA_LIST
 #define _VA_LIST va_list
 #endif
+#endif /* __i860__ */
 typedef __gnuc_va_list va_list;
 #endif /* _VA_LIST_ */