From 135a5102a3e5422a1c9c8ad28f58888eea4a2545 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 6 Dec 2011 19:49:20 -0500 Subject: Revert "Make pending libevent actions cancelable" This reverts commit aba25a6939a5907d40dbcff7433a8c130ffd12ad. --- src/common/compat_libevent.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/common/compat_libevent.h') diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 4076cc0e08..3f916d16b0 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -44,12 +44,10 @@ void tor_event_free(struct event *ev); #define tor_evdns_add_server_port evdns_add_server_port #endif -typedef struct tor_libevent_action_t tor_libevent_action_t; -tor_libevent_action_t *tor_run_in_libevent_loop(void (*cb)(void *arg), - void *arg); -void tor_cancel_libevent_action(tor_libevent_action_t *action); - typedef struct periodic_timer_t periodic_timer_t; + +int tor_run_in_libevent_loop(void (*cb)(void *arg), void *arg); + periodic_timer_t *periodic_timer_new(struct event_base *base, const struct timeval *tv, void (*cb)(periodic_timer_t *timer, void *data), -- cgit v1.2.3-54-g00ecf