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/common/procmon.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/common/procmon.c')
| -rw-r--r-- | src/common/procmon.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/common/procmon.c b/src/common/procmon.c index 4ecee26e8d..466044deb8 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -10,11 +10,7 @@ #include "util.h" -#ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> -#else -#include <event.h> -#endif #ifdef HAVE_SIGNAL_H #include <signal.h> @@ -164,11 +160,7 @@ tor_validate_process_specifier(const char *process_spec, } /* XXXX we should use periodic_timer_new() for this stuff */ -#ifdef HAVE_EVENT2_EVENT_H #define PERIODIC_TIMER_FLAGS EV_PERSIST -#else -#define PERIODIC_TIMER_FLAGS (0) -#endif /* DOCDOC poll_interval_tv */ static struct timeval poll_interval_tv = {15, 0}; @@ -331,10 +323,6 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (its_dead_jim) { procmon->cb(procmon->cb_arg); -#ifndef HAVE_EVENT2_EVENT_H - } else { - evtimer_add(procmon->e, &poll_interval_tv); -#endif } } #endif |