Please test & review this patch:

http://phk.freebsd.dk/patch/offsetof.patch

----------------- Define offsetof() in <sys/types.h> for the kernel and in <stddef.h> for userland.

#ifdef the definition in <stddef.h> and <sys/types.h> so that we don't need N identical definitions in <machine/ansi.h> but still allow for a MD definition there should need be.

Use offsetof() instead of fldoff()

Remove nested include of <struct.h> from <sys/queue.h>

Remove local definitions of offsetof().

Deprecate <struct.h>

-----------------

Files affected:

Index: include/stddef.h Index: include/struct.h Index: sys/alpha/alpha/machdep.c Index: sys/dev/aac/aac.c Index: sys/dev/aac/aacvar.h Index: sys/dev/mly/mly.c Index: sys/dev/sym/sym_hipd.c Index: sys/dev/wds/wd7000.c Index: sys/i386/i386/machdep.c Index: sys/ia64/ia64/machdep.c Index: sys/kern/sysv_sem.c Index: sys/kern/uipc_usrreq.c Index: sys/net/if_stf.c Index: sys/netinet/in_gif.c Index: sys/netinet6/frag6.c Index: sys/netinet6/icmp6.c Index: sys/netinet6/in6_gif.c Index: sys/netinet6/in6_proto.c Index: sys/netinet6/raw_ip6.c Index: sys/netkey/key.c Index: sys/pc98/i386/machdep.c Index: sys/sys/queue.h Index: sys/sys/types.h

To Unsubscribe: send mail to majo...@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message