aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat_libevent.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
commit135a5102a3e5422a1c9c8ad28f58888eea4a2545 (patch)
tree1c69b5c10629b058e2e49aad6faf6db7ea483a77 /src/common/compat_libevent.h
parent50fd99d7ef01f74fd794eb430cf28b5c84e48446 (diff)
downloadtor-135a5102a3e5422a1c9c8ad28f58888eea4a2545.tar
tor-135a5102a3e5422a1c9c8ad28f58888eea4a2545.tar.gz
Revert "Make pending libevent actions cancelable"
This reverts commit aba25a6939a5907d40dbcff7433a8c130ffd12ad.
Diffstat (limited to 'src/common/compat_libevent.h')
-rw-r--r--src/common/compat_libevent.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 4076cc0e0..3f916d16b 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),