Test __bsdi__ like __BSD_NET2__.

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

diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h
index 822618d..00ed696 100644 (file)
--- a/gcc/ginclude/stdarg.h
+++ b/gcc/ginclude/stdarg.h
@@ -136,13 +136,13 @@ typedef __gnuc_va_list va_list;
    But on BSD NET2 we must not test or define or undef it.
    (Note that the comments in NET 2's ansi.h
    are incorrect for _VA_LIST_--see stdio.h!)  */
-#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____)
+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__)
 /* The macro _VA_LIST is used in SCO Unix 3.2.  */
 #ifndef _VA_LIST
 /* The macro _VA_LIST_T_H is used in the Bull dpx2  */
 #ifndef _VA_LIST_T_H
 #define _VA_LIST_T_H
-#if !(defined (__BSD_NET2__) || defined (____386BSD____))
+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__))
 #define _VA_LIST_
 #endif
 #define _VA_LIST

diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h
index 974b2ad..ba3b4e2 100644 (file)
--- a/gcc/ginclude/varargs.h
+++ b/gcc/ginclude/varargs.h
@@ -150,13 +150,13 @@ typedef __gnuc_va_list va_list;
 /* Michael Eriksson <mer@sics.se> at Thu Sep 30 11:00:57 1993:
    Sequent defines _VA_LIST_ in <machine/machtypes.h> to be the type to
    use for va_list (``typedef _VA_LIST_ va_list'') */
-#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__sequent__)
+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__)
 /* The macro _VA_LIST is used in SCO Unix 3.2.  */
 #ifndef _VA_LIST
 /* The macro _VA_LIST_T_H is used in the Bull dpx2  */
 #ifndef _VA_LIST_T_H
 #define _VA_LIST_T_H
-#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__sequent__))
+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__))
 #define _VA_LIST_
 #endif
 #define _VA_LIST