diff options
| author | Maya Rashish <coypu@sdf.org> | 2018-06-20 09:54:35 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2018-06-20 09:54:35 +0000 |
| commit | ada818fda1a972673bd1403563025424a0498c3b (patch) | |
| tree | d4430301330f8108fa608862d93d97de478101ee /gcc | |
| parent | 9f5361c8cac181dbc79b7302d7241a61e0ce2386 (diff) | |
| download | gcc-ada818fda1a972673bd1403563025424a0498c3b.zip gcc-ada818fda1a972673bd1403563025424a0498c3b.tar.gz gcc-ada818fda1a972673bd1403563025424a0498c3b.tar.bz2 | |
* ginclude/stddef.h: Limit #include <machine/ansi.h> to NetBSD.
From-SVN: r261797
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ginclude/stddef.h | 20 |
2 files changed, 9 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae49015..f7a2ee7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2018-06-20 Maya Rashish <coypu@sdf.org> + + * ginclude/stddef.h: Limit #include <machine/ansi.h> to NetBSD. + 2018-06-20 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * config/aarch64/aarch64-tuning-flags.def (no_ldp_stp_qregs): New. diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h index 31b96a7..15a99e7 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -46,9 +46,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see /* This avoids lossage on SunOS but only if stdtypes.h comes first. There's no way to win with the other order! Sun lossage. */ -/* On 4.3bsd-net2, make sure ansi.h is included, so we have - one less case to deal with in the following. */ -#if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__) +#if defined(__NetBSD__) #include <machine/ansi.h> #endif /* On FreeBSD 5, machine/ansi.h does not exist anymore... */ @@ -56,11 +54,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include <sys/_types.h> #endif -/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are - defined if the corresponding type is *not* defined. - FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_. - NetBSD defines _I386_ANSI_H_ and _X86_64_ANSI_H_ instead of _ANSI_H_ */ -#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(_X86_64_ANSI_H_) || defined(_I386_ANSI_H_) +#if defined(__NetBSD__) #if !defined(_SIZE_T_) && !defined(_BSD_SIZE_T_) #define _SIZE_T #endif @@ -87,7 +81,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef _WCHAR_T_ #undef _BSD_WCHAR_T_ #endif -#endif /* defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(_X86_64_ANSI_H_) || defined(_I386_ANSI_H_) */ +#endif /* defined(__NetBSD__) */ /* Sequent's header files use _PTRDIFF_T_ in some conflicting way. Just ignore it. */ @@ -359,11 +353,7 @@ typedef __WINT_TYPE__ wint_t; #undef __need_wint_t #endif -/* In 4.3bsd-net2, leave these undefined to indicate that size_t, etc. - are already defined. */ -/* BSD/OS 3.1 and FreeBSD [23].x require the MACHINE_ANSI_H check here. */ -/* NetBSD 5 requires the I386_ANSI_H and X86_64_ANSI_H checks here. */ -#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(_X86_64_ANSI_H_) || defined(_I386_ANSI_H_) +#if defined(__NetBSD__) /* The references to _GCC_PTRDIFF_T_, _GCC_SIZE_T_, and _GCC_WCHAR_T_ are probably typos and should be removed before 2.8 is released. */ #ifdef _GCC_PTRDIFF_T_ @@ -391,7 +381,7 @@ typedef __WINT_TYPE__ wint_t; #undef _WCHAR_T_ #undef _BSD_WCHAR_T_ #endif -#endif /* _ANSI_H_ || _MACHINE_ANSI_H_ || _X86_64_ANSI_H_ || _I386_ANSI_H_ */ +#endif /* __NetBSD__ */ #endif /* __sys_stdtypes_h */ |