From 54ca48450cf20c453a092aa95d086cd5c5751fcf Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Fri, 27 Oct 2000 11:45:49 +0000
Subject: 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
---
 sys/pc98/i386/machdep.c | 2 --
 sys/pc98/pc98/machdep.c | 2 --
 2 files changed, 4 deletions(-)

(limited to 'sys/pc98')

diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index eba5061..591503b 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -264,8 +264,6 @@ struct cpuhead cpuhead;
 MUTEX_DECLARE(,sched_lock);
 MUTEX_DECLARE(,Giant);
 
-#define offsetof(type, member)	((size_t)(&((type *)0)->member))
-
 static void
 cpu_startup(dummy)
 	void *dummy;
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index eba5061..591503b 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -264,8 +264,6 @@ struct cpuhead cpuhead;
 MUTEX_DECLARE(,sched_lock);
 MUTEX_DECLARE(,Giant);
 
-#define offsetof(type, member)	((size_t)(&((type *)0)->member))
-
 static void
 cpu_startup(dummy)
 	void *dummy;
-- 
cgit v1.1