diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-12-02 16:10:17 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-12-02 16:10:17 -0500 |
commit | d9edee3a3b98eaae5192f1307197d1a33122ec61 (patch) | |
tree | 090d61bc682dd2f1eded88a8dcd1b6fa232c95b2 /src/common/compat.c | |
parent | f78fc8cfb4de9dac3d806c22fc577c8103df2420 (diff) | |
parent | 2b5a0356047e7622c66e434cd8ac4a7689d4cc28 (diff) | |
download | tor-d9edee3a3b98eaae5192f1307197d1a33122ec61.tar.gz tor-d9edee3a3b98eaae5192f1307197d1a33122ec61.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/compat.c')
-rw-r--r-- | src/common/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index ea95f9f085..33e2864ada 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -979,7 +979,7 @@ tor_open_socket(int domain, int type, int protocol) /** As socket(), but counts the number of open sockets. */ tor_socket_t -tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) +tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { tor_socket_t s; #if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) |