diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-04-03 13:54:22 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-04-03 13:54:22 +0000 |
| commit | 06524b6eaf6ef7715d3e297c89df6dcdc04cfc2d (patch) | |
| tree | 9b6cfdc00b8d93a124d73e53aaabdd9d70384e1e | |
| parent | 14ac38fcd93d0d22f3bd8743f823a36ae175dc4f (diff) | |
Kill redundant offsetof definitions; ok deraadt henning sthen thib
| -rw-r--r-- | sys/netinet6/frag6.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/icmp6.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/in6_gif.c | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 4caa0656e96..8e80accd150 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.32 2011/03/06 19:55:54 bluhm Exp $ */ +/* $OpenBSD: frag6.c,v 1.33 2011/04/03 13:54:21 stsp Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -124,10 +124,6 @@ do { \ #define IP6Q_UNLOCK() ip6q_unlock() -#ifndef offsetof /* XXX */ -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) -#endif - /* * Initialise reassembly queue and fragment identifier. */ diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 25a2380eb6c..c9889355c7f 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.113 2010/07/09 15:44:20 claudio Exp $ */ +/* $OpenBSD: icmp6.c,v 1.114 2011/04/03 13:54:21 stsp Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -1181,9 +1181,6 @@ icmp6_mtudisc_update(struct ip6ctlparam *ip6cp, int validated) * - joins NI group address at in6_ifattach() time only, does not cope * with hostname changes by sethostname(3) */ -#ifndef offsetof /* XXX */ -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) -#endif struct mbuf * ni6_input(struct mbuf *m, int off) { diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 2e37eb823b6..2078021ceab 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_gif.c,v 1.29 2010/05/11 09:36:07 claudio Exp $ */ +/* $OpenBSD: in6_gif.c,v 1.30 2011/04/03 13:54:21 stsp Exp $ */ /* $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $ */ /* @@ -69,10 +69,6 @@ #include <netinet/ip_ether.h> #endif -#ifndef offsetof -#define offsetof(s, e) ((int)&((s *)0)->e) -#endif - /* * family - family of the packet to be encapsulate. */ |