diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
| commit | 21de9d46e264ceb14f3fe59d17210d82f2499637 (patch) | |
| tree | 225afa4993f268fc867d922e646f0449cedebf1c /src/or/eventdns.c | |
| parent | 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 (diff) | |
| parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
| download | tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar.gz tor-21de9d46e264ceb14f3fe59d17210d82f2499637.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.c
src/or/main.c
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 0a0fef43f3..321b7d753f 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)))) |