diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-06-04 03:24:53 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-06-12 14:27:53 -0400 |
commit | 33b1d714e779a714c2d55e5da09d0e3c682f273a (patch) | |
tree | 181298ff8014f9463d17f14d52d30150336410a6 /src/common/compat_libevent.c | |
parent | c0af3cdfb6816659031fed5a1b8feec5d457b608 (diff) | |
download | tor-33b1d714e779a714c2d55e5da09d0e3c682f273a.tar.gz tor-33b1d714e779a714c2d55e5da09d0e3c682f273a.zip |
Make Tor compile with Libevent 1.0 again.
Diffstat (limited to 'src/common/compat_libevent.c')
-rw-r--r-- | src/common/compat_libevent.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index ce9f6a0fd3..d9843c9c3c 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -134,7 +134,6 @@ tor_event_free(struct event *ev) /** Global event base for use by the main thread. */ struct event_base *the_event_base = NULL; - /* This is what passes for version detection on OSX. We set * MACOSX_KQUEUE_IS_BROKEN to true iff we're on a version of OSX before * 10.4.0 (aka 1040). */ @@ -188,6 +187,18 @@ tor_libevent_get_base(void) return the_event_base; } + +#ifndef HAVE_EVENT_BASE_LOOPEXIT +/* Replacement for event_base_loopexit on some very old versions of Libevent + that we are not yet brave enough to deprecate. */ +int +tor_event_base_loopexit(struct event_base *base, struct timeval *tv) +{ + tor_assert(base == the_event_base); + return event_loopexit(tv); +} +#endif + /** Return the name of the Libevent backend we're using. */ const char * tor_libevent_get_method(void) |