diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
| commit | da7c60dcf310fb9914bfd1b84a34b440ab04900a (patch) | |
| tree | 1a30bd8ef9e3473a45a5c72c538afceae9233412 /src/or/eventdns.c | |
| parent | 6802499413f8efd98ad4d578e5ef937cb55c1edc (diff) | |
| parent | cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd (diff) | |
| download | tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.tar tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.tar.gz | |
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
Diffstat (limited to 'src/or/eventdns.c')
| -rw-r--r-- | src/or/eventdns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 4753429b1..42e16aec7 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1563,7 +1563,7 @@ evdns_request_data_build(const char *const name, const size_t name_len, /* exported function */ struct evdns_server_port * -evdns_add_server_port(int socket, int is_tcp, evdns_request_callback_fn_type cb, void *user_data) +evdns_add_server_port(tor_socket_t socket, int is_tcp, evdns_request_callback_fn_type cb, void *user_data) { struct evdns_server_port *port; if (!(port = mm_malloc(sizeof(struct evdns_server_port)))) |