Skip to content

R
riscv-gcc-1
Commit 1997cb46 by Richard Kenner
Options

Protect va_list definition from SCO headers. 

From-SVN: r14286
parent 8458d268
Showing with 8 additions and 2 deletions
gcc/ginclude/stdarg.h
...@@ -136,7 +136,7 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */ ...@@ -136,7 +136,7 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */
#undef _BSD_VA_LIST #undef _BSD_VA_LIST
#endif #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, /* SVR4.2 uses _VA_LIST for an internal alias for va_list,
so we must avoid testing it and setting it here. so we must avoid testing it and setting it here.
SVR4 uses _VA_LIST as a flag in stdarg.h, but we should 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 */ ...@@ -149,6 +149,9 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */
#endif #endif
#endif /* __i860__ */ #endif /* __i860__ */
typedef __gnuc_va_list va_list; typedef __gnuc_va_list va_list;
#ifdef _SCO_DS
#define __VA_LIST
#endif
#endif /* _VA_LIST_ */ #endif /* _VA_LIST_ */
#else /* not __svr4__ || _SCO_DS */ #else /* not __svr4__ || _SCO_DS */
......
gcc/ginclude/varargs.h
...@@ -146,7 +146,7 @@ typedef void *__gnuc_va_list; ...@@ -146,7 +146,7 @@ typedef void *__gnuc_va_list;
#undef _VA_LIST #undef _VA_LIST
#endif #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, /* SVR4.2 uses _VA_LIST for an internal alias for va_list,
so we must avoid testing it and setting it here. so we must avoid testing it and setting it here.
SVR4 uses _VA_LIST as a flag in stdarg.h, but we should SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
...@@ -159,6 +159,9 @@ typedef void *__gnuc_va_list; ...@@ -159,6 +159,9 @@ typedef void *__gnuc_va_list;
#endif #endif
#endif /* __i860__ */ #endif /* __i860__ */
typedef __gnuc_va_list va_list; typedef __gnuc_va_list va_list;
#ifdef _SCO_DS
#define __VA_LIST
#endif
#endif /* _VA_LIST_ */ #endif /* _VA_LIST_ */
#else /* not __svr4__ || _SCO_DS */ #else /* not __svr4__ || _SCO_DS */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment