Given that both Mike and me considered this patch on the obvious side, I now committed the following variation thereof on trunk.
(Note the line break and comment change. 5! = 120 did not seem like a useful version number. ;-) Gerald Index: ginclude/stddef.h =================================================================== --- ginclude/stddef.h (revision 184130) +++ ginclude/stddef.h (working copy) @@ -200,8 +200,9 @@ #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
