From 27d65ef26791ef5368f36d176829e0053e30cfef Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Sun, 17 Jun 2007 00:33:34 +0000 Subject: [PATCH] Replace incorrect local OFFSET_OF macro with the correct and generic offsetof macro. --- sys/netinet/ip_dummynet.c | 2 +- sys/netinet/ip_dummynet.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c index 7af8f210dc40..bc3100ff0740 100644 --- a/sys/netinet/ip_dummynet.c +++ b/sys/netinet/ip_dummynet.c @@ -1696,7 +1696,7 @@ config_pipe(struct dn_pipe *p) */ pipe->idle_heap.size = pipe->idle_heap.elements = 0; pipe->idle_heap.offset = - OFFSET_OF(struct dn_flow_queue, heap_pos); + offsetof(struct dn_flow_queue, heap_pos); } else /* Flush accumulated credit for all queues. */ for (i = 0; i <= pipe->fs.rq_size; i++) diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h index de12c65aaecc..5215d932f49b 100644 --- a/sys/netinet/ip_dummynet.h +++ b/sys/netinet/ip_dummynet.h @@ -70,11 +70,6 @@ typedef u_int64_t dn_key ; /* sorting key */ * virtual time wraps every 15 days. */ -/* - * The OFFSET_OF macro is used to return the offset of a field within - * a structure. It is used by the heap management routines. - */ -#define OFFSET_OF(type, field) ((int)&( ((type *)0)->field) ) /* * The maximum hash table size for queues. This value must be a power