diff options
| author | Robert Millan <rmh@gnu.org> | 2012-02-12 01:06:04 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2012-02-12 01:06:04 +0000 |
| commit | 56c534c50dab473813b5f2bbdbec907999193654 (patch) | |
| tree | e39b927e4e207c5206fee5879e91edcd0200d066 | |
| parent | 9e0c351dcd71c0fa80aea42888ac48c4fff49796 (diff) | |
| download | gcc-56c534c50dab473813b5f2bbdbec907999193654.zip gcc-56c534c50dab473813b5f2bbdbec907999193654.tar.gz gcc-56c534c50dab473813b5f2bbdbec907999193654.tar.bz2 | |
stddef.h [...] (__size_t): Do not define.
* ginclude/stddef.h [__FreeBSD_kernel__] (__size_t): Do not define.
Tweak comment.
Co-Authored-By: Gerald Pfeifer <gerald@pfeifer.com>
From-SVN: r184135
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ginclude/stddef.h | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b9af710..44b8b88 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-29 Robert Millan <rmh@gnu.org> + Gerald Pfeifer <gerald@pfeifer.com> + + * ginclude/stddef.h [__FreeBSD_kernel__] (__size_t): Do not define. + Tweak comment. + 2012-02-11 Richard Sandiford <rdsandiford@googlemail.com> PR rtl-optimization/52175 diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h index a78a770..8a03948 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -200,8 +200,9 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; #define ___int_size_t_h #define _GCC_SIZE_T #define _SIZET_ -#if defined (__FreeBSD__) && (__FreeBSD__ >= 5) -/* __size_t is a typedef on FreeBSD 5!, must not trash it. */ +#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) +/* __size_t is a typedef on FreeBSD 5, must not trash it. */ #else #define __size_t #endif |