(va_list) [__SVR4_2__]: Don't set or test _VA_LIST.

From-SVN: r2500
This commit is contained in:
Richard Stallman 1992-10-17 07:39:31 +00:00
parent 037080855f
commit eae92d827e
2 changed files with 25 additions and 0 deletions

View File

@ -94,6 +94,15 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */
#undef _BSD_VA_LIST #undef _BSD_VA_LIST
#endif #endif
#ifdef __SVR4_2__
/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
so we must avoid testing it and setting it here. */
#ifndef _VA_LIST_
#define _VA_LIST_
typedef __gnuc_va_list va_list;
#endif /* _VA_LIST_ */
#else /* not __SVR4_2__ */
/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ /* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */
#ifndef _VA_LIST_ #ifndef _VA_LIST_
/* The macro _VA_LIST is used in SCO Unix 3.2. */ /* The macro _VA_LIST is used in SCO Unix 3.2. */
@ -103,6 +112,9 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */
typedef __gnuc_va_list va_list; typedef __gnuc_va_list va_list;
#endif /* _VA_LIST */ #endif /* _VA_LIST */
#endif /* _VA_LIST_ */ #endif /* _VA_LIST_ */
#endif /* not __SVR4_2__ */
#endif /* _STDARG_H */ #endif /* _STDARG_H */
#endif /* __GNUC__ */ #endif /* __GNUC__ */

View File

@ -115,6 +115,17 @@ typedef void *__gnuc_va_list;
#undef _VA_LIST_ #undef _VA_LIST_
#endif #endif
#ifdef __SVR4_2__
/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
so we must avoid testing it and setting it here. */
#ifndef _VA_LIST_
#define _VA_LIST_
typedef __gnuc_va_list va_list;
#endif /* _VA_LIST_ */
#else /* not __SVR4_2__ */
/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */ /* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */
#ifndef _VA_LIST_ #ifndef _VA_LIST_
/* The macro _VA_LIST is used in SCO Unix 3.2. */ /* The macro _VA_LIST is used in SCO Unix 3.2. */
@ -125,6 +136,8 @@ typedef __gnuc_va_list va_list;
#endif /* _VA_LIST */ #endif /* _VA_LIST */
#endif /* _VA_LIST_ */ #endif /* _VA_LIST_ */
#endif /* not __SVR4_2__ */
/* I think that in 4.3bsd-net2 there is some need /* I think that in 4.3bsd-net2 there is some need
to leave _VA_LIST_ undefined after. I don't know why. -- rms. */ to leave _VA_LIST_ undefined after. I don't know why. -- rms. */
#ifdef _ANSI_H_ #ifdef _ANSI_H_