diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2016-07-03 19:42:36 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2016-07-04 12:40:09 +0200 |
| commit | 265e40b481d23ea0ee8b4e1705fb013532d1f6b2 (patch) | |
| tree | 9a2bdf42de2c95cbbbe861078887a684b5d91b38 /src/test/test_scheduler.c | |
| parent | ec6ea66240df36d2a6bb6d4fd0df6f4c2cdb3191 (diff) | |
| download | tor-265e40b481d23ea0ee8b4e1705fb013532d1f6b2.tar.gz tor-265e40b481d23ea0ee8b4e1705fb013532d1f6b2.zip | |
Raise libevent dependency to 2.0.10-stable or newer
Only some very ancient distributions don't ship with Libevent 2 anymore,
even the oldest supported Ubuntu LTS version has it. This allows us to
get rid of a lot of compat code.
Diffstat (limited to 'src/test/test_scheduler.c')
| -rw-r--r-- | src/test/test_scheduler.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 15fbb2d186..6d21d0344d 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -5,12 +5,7 @@ #include "orconfig.h" -/* Libevent stuff */ -#ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> -#else -#include <event.h> -#endif #define TOR_CHANNEL_INTERNAL_ #define CHANNEL_PRIVATE_ @@ -90,9 +85,7 @@ mock_event_free_all(void) static void mock_event_init(void) { -#ifdef HAVE_EVENT2_EVENT_H struct event_config *cfg = NULL; -#endif tt_ptr_op(mock_event_base, ==, NULL); @@ -102,7 +95,6 @@ mock_event_init(void) */ if (!mock_event_base) { -#ifdef HAVE_EVENT2_EVENT_H cfg = event_config_new(); #if LIBEVENT_VERSION_NUMBER >= V(2,0,9) /* We can enable changelist support with epoll, since we don't give @@ -111,9 +103,6 @@ mock_event_init(void) #endif mock_event_base = event_base_new_with_config(cfg); event_config_free(cfg); -#else - mock_event_base = event_init(); -#endif } tt_assert(mock_event_base != NULL); |