svn commit: r186672 - user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet

[Kip Macy]

Author: kmacy
Date: Thu Jan  1 03:08:34 2009
New Revision: 186672
URL: http://svn.freebsd.org/changeset/base/186672

Log:
  use gcc __offsetof

Modified:
  user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_compat.h
  user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_sync.c

Modified: user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Jan  1 03:08:07 2009	(r186671)
+++ user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Jan  1 03:08:34 2009	(r186672)
@@ -1825,7 +1825,7 @@ typedef	struct	tcpiphdr	tcpiphdr_t;
 #endif
 
 #ifndef offsetof
-# define offsetof(t,m) (int)((&((t *)0L)->m))
+# define offsetof(t,m) (size_t)((&((t *)0L)->m))
 #endif
 
 /*

Modified: user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_sync.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_sync.c	Thu Jan  1 03:08:07 2009	(r186671)
+++ user/kmacy/HEAD_fast_net/sys/contrib/ipfilter/netinet/ip_sync.c	Thu Jan  1 03:08:34 2009	(r186672)
@@ -729,9 +729,9 @@ void *data;
 		}
 
 		nat = (nat_t *)data;
-		bzero((char *)n, offsetof(nat_t, nat_age));
+		bzero((char *)n, __offsetof(nat_t, nat_age));
 		bcopy((char *)&nat->nat_age, (char *)&n->nat_age,
-		      sizeof(*n) - offsetof(nat_t, nat_age));
+		      sizeof(*n) - __offsetof(nat_t, nat_age));
 		ipfsync_natorder(0, n);
 		n->nat_sync = sl;