diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-18 13:14:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-18 13:14:44 -0500 |
| commit | ee717f35c44fa0ec3fc37ca8865a80e321105c33 (patch) | |
| tree | 0afe399d1037f6f7b92fa905592685c682155b53 | |
| parent | 1e923dd2fbdc0834b8fb3ba97b658f15a6d5f6b4 (diff) | |
| download | tor-ee717f35c44fa0ec3fc37ca8865a80e321105c33.tar.gz tor-ee717f35c44fa0ec3fc37ca8865a80e321105c33.zip | |
Use tor_socket_t, not unsigned, in tor-fw-helper-natmp.c
| -rw-r--r-- | changes/bug1983_win64 | 3 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug1983_win64 b/changes/bug1983_win64 new file mode 100644 index 0000000000..6d2eae39d1 --- /dev/null +++ b/changes/bug1983_win64 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Use an appropriate-width type for sockets in tor-fw-helper on + win664. Fixes bug 1983 at last. Bugfix on 0.2.3.9-alpha. diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index 2380b141df..a3a52d1037 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -87,7 +87,7 @@ tor_natpmp_cleanup(tor_fw_options_t *tor_fw_options, void *backend_state) /** Use select() to wait until we can read on fd. */ static int -wait_until_fd_readable(unsigned int fd, struct timeval *timeout) +wait_until_fd_readable(tor_socket_t fd, struct timeval *timeout) { int r; fd_set fds; |