diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-04-12 22:02:54 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-04-12 22:02:54 +0000 |
| commit | 0b47b125cfe584f6d6c12a748208ceec3430990e (patch) | |
| tree | 1bb0accb2e453d085d2d739deaf4d4ae0d573d24 /bufferevent_pair.c | |
| parent | bbd6a332e17fd934d7ec9cac6b9dd2f327c60bcb (diff) | |
| download | libevent-0b47b125cfe584f6d6c12a748208ceec3430990e.tar.gz | |
Add a new EVUTIL_UPCAST macro so that I do not need to keep figuring out the right offsetof magic over and over.
svn:r1160
Diffstat (limited to 'bufferevent_pair.c')
| -rw-r--r-- | bufferevent_pair.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bufferevent_pair.c b/bufferevent_pair.c index 5e12ae8a..444b954c 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -39,6 +39,7 @@ #include "defer-internal.h" #include "bufferevent-internal.h" #include "mm-internal.h" +#include "util-internal.h" struct bufferevent_pair { struct bufferevent bev; @@ -56,8 +57,7 @@ upcast(struct bufferevent *bev) struct bufferevent_pair *bev_p; if (bev->be_ops != &bufferevent_ops_pair) return NULL; - bev_p = (void*)( ((char*)bev) - - evutil_offsetof(struct bufferevent_pair, bev) ); + bev_p = EVUTIL_UPCAST(bev, struct bufferevent_pair, bev); assert(bev_p->bev.be_ops == &bufferevent_ops_pair); return bev_p; } |