diff options
| author | phk <phk@FreeBSD.org> | 2000-10-27 11:45:49 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-10-27 11:45:49 +0000 |
| commit | 54ca48450cf20c453a092aa95d086cd5c5751fcf (patch) | |
| tree | 479cfa046c848adf9e8ada76b004eeda743154db /sys/ia64 | |
| parent | ea5581599fd86937f5f773c8e66aedd6a3524383 (diff) | |
| download | FreeBSD-src-54ca48450cf20c453a092aa95d086cd5c5751fcf.zip FreeBSD-src-54ca48450cf20c453a092aa95d086cd5c5751fcf.tar.gz | |
Convert all users of fldoff() to offsetof(). fldoff() is bad
because it only takes a struct tag which makes it impossible to
use unions, typedefs etc.
Define __offsetof() in <machine/ansi.h>
Define offsetof() in terms of __offsetof() in <stddef.h> and <sys/types.h>
Remove myriad of local offsetof() definitions.
Remove includes of <stddef.h> in kernel code.
NB: Kernelcode should *never* include from /usr/include !
Make <sys/queue.h> include <machine/ansi.h> to avoid polluting the API.
Deprecate <struct.h> with a warning. The warning turns into an error on
01-12-2000 and the file gets removed entirely on 01-01-2001.
Paritials reviews by: various.
Significant brucifications by: bde
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/machdep.c | 2 | ||||
| -rw-r--r-- | sys/ia64/include/ansi.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 434f012..0fae551 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -164,8 +164,6 @@ static vm_offset_t buffer_sva, buffer_eva; vm_offset_t clean_sva, clean_eva; static vm_offset_t pager_sva, pager_eva; -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) - static void cpu_startup(dummy) void *dummy; diff --git a/sys/ia64/include/ansi.h b/sys/ia64/include/ansi.h index c5ef23d..c4e1156 100644 --- a/sys/ia64/include/ansi.h +++ b/sys/ia64/include/ansi.h @@ -101,6 +101,11 @@ #define _BSD_CLOCKS_PER_SEC_ 100 /* + * We define this here since both <stddef.h> and <sys/types.h> needs it. + */ +#define __offsetof(type, field) ((size_t)(&((type *)0)->field)) + +/* * Internal names for basic integral types. Omit the typedef if * not possible for a machine/compiler combination. */ |
