diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-29 12:24:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-29 12:24:52 -0400 |
| commit | b0138cd05540001f084b7bd828b3dcffbaeb5b22 (patch) | |
| tree | 2c72638364925302b6fe3c6225c5cef9ddaaf8f7 /src/common/compat_libevent.h | |
| parent | 37a76d75dd38a1ebd45627bb6e29e40f60917188 (diff) | |
| parent | b82e166bec5fcc468424af1ff71e2e753ac534a2 (diff) | |
| download | tor-b0138cd05540001f084b7bd828b3dcffbaeb5b22.tar.gz tor-b0138cd05540001f084b7bd828b3dcffbaeb5b22.zip | |
Merge remote-tracking branch 'public/bug12985_024' into bug12984_025
Diffstat (limited to 'src/common/compat_libevent.h')
| -rw-r--r-- | src/common/compat_libevent.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 9ee7b49cfb..b2f60cd65a 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -28,11 +28,9 @@ void suppress_libevent_log_msg(const char *msg); #define tor_event_new event_new #define tor_evtimer_new evtimer_new #define tor_evsignal_new evsignal_new -#define tor_event_free event_free #define tor_evdns_add_server_port(sock, tcp, cb, data) \ evdns_add_server_port_with_base(tor_libevent_get_base(), \ (sock),(tcp),(cb),(data)); - #else struct event *tor_event_new(struct event_base * base, evutil_socket_t sock, short what, void (*cb)(evutil_socket_t, short, void *), void *arg); @@ -40,10 +38,11 @@ struct event *tor_evtimer_new(struct event_base * base, void (*cb)(evutil_socket_t, short, void *), void *arg); struct event *tor_evsignal_new(struct event_base * base, int sig, void (*cb)(evutil_socket_t, short, void *), void *arg); -void tor_event_free(struct event *ev); #define tor_evdns_add_server_port evdns_add_server_port #endif +void tor_event_free(struct event *ev); + typedef struct periodic_timer_t periodic_timer_t; periodic_timer_t *periodic_timer_new(struct event_base *base, |