diff options
| author | Richard Stallman <rms@gnu.org> | 1993-04-04 07:16:41 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1993-04-04 07:16:41 +0000 |
| commit | 32e69e1dc8631017cc4def2dbed69cdcd5a92257 (patch) | |
| tree | 2c63a372e1a8b1ce215fc1046b8c2d310de079d4 /gcc | |
| parent | 3971e415cd0e059294f849def61ff96c9c22f423 (diff) | |
| download | gcc-32e69e1dc8631017cc4def2dbed69cdcd5a92257.zip gcc-32e69e1dc8631017cc4def2dbed69cdcd5a92257.tar.gz gcc-32e69e1dc8631017cc4def2dbed69cdcd5a92257.tar.bz2 | |
[__svr4__]: Test only _VA_LIST_ to avoid dup typedef.
(This used to test __SVR4_2__.)
From-SVN: r3998
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ginclude/varargs.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 3724160..4c6e352 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_. */ |