mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-02-04 21:10:18 +08:00
Protect va_list definition from SCO headers.
From-SVN: r14286
This commit is contained in:
parent
8458d268d2
commit
1997cb46f7
@ -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 */
|
||||
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user