From eb1087ac9fb2231162b42931f01122796b027c30 Mon Sep 17 00:00:00 2001 From: rms Date: Sun, 4 Apr 1993 07:16:41 +0000 Subject: [PATCH] [__svr4__]: Test only _VA_LIST_ to avoid dup typedef. (This used to test __SVR4_2__.) git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@3998 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ginclude/varargs.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 3724160feb5..4c6e35232a0 100644 --- a/gcc/ginclude/varargs.h +++ b/gcc/ginclude/varargs.h @@ -122,16 +122,17 @@ typedef void *__gnuc_va_list; #undef _VA_LIST #endif -#ifdef __SVR4_2__ - +#ifdef __svr4__ /* 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 + have no conflict with that. */ #ifndef _VA_LIST_ #define _VA_LIST_ typedef __gnuc_va_list va_list; #endif /* _VA_LIST_ */ -#else /* not __SVR4_2__ */ +#else /* not __svr4__ */ /* The macro _VA_LIST_ is the same thing used by this file in Ultrix. But on BSD NET2 we must not test or define or undef it. @@ -152,7 +153,7 @@ typedef __gnuc_va_list va_list; #endif /* not _VA_LIST */ #endif /* not _VA_LIST_ */ -#endif /* not __SVR4_2__ */ +#endif /* not __svr4__ */ /* The next BSD release (if there is one) wants this symbol to be undefined instead of _VA_LIST_. */ -- 2.11.0