From 1ed27048e4807fe2bf182e9544dc9c7b4741cbc0 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 10 Feb 2009 21:39:56 +0000 Subject: [PATCH] Stop rolling our own offsetof twice. svn:r1113 --- evdns.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/evdns.c b/evdns.c index 7f6f74b9..7b76ee39 100644 --- a/evdns.c +++ b/evdns.c @@ -323,14 +323,11 @@ struct evdns_base { static struct evdns_base *current_base = NULL; -/* helper macro */ -#define OFFSET_OF(st, member) ((off_t) (((char*)&((st*)0)->member)-(char*)0)) - /* Given a pointer to an evdns_server_request, get the corresponding */ /* server_request. */ -#define TO_SERVER_REQUEST(base_ptr) \ - ((struct server_request*) \ - (((char*)(base_ptr) - OFFSET_OF(struct server_request, base)))) +#define TO_SERVER_REQUEST(base_ptr) \ + ((struct server_request*) \ + (((char*)(base_ptr) - evutil_offsetof(struct server_request, base)))) #define REQ_HEAD(base, id) ((base)->req_heads[id % (base)->n_req_heads]) -- 2.50.1