diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:29:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:29:41 -0500 |
| commit | 1772782e425734967981b79be1122017ef606dd0 (patch) | |
| tree | 84c950ac062879c4961376ee256d9dbf9ffa4c8b | |
| parent | d04bf66120420e89ddb479316f4026869abc9154 (diff) | |
| parent | 6d595fa4cf679cf7c66673726596548758a298bc (diff) | |
| download | tor-1772782e425734967981b79be1122017ef606dd0.tar.gz tor-1772782e425734967981b79be1122017ef606dd0.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug4533_part2 | 5 | ||||
| -rw-r--r-- | src/common/compat.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug4533_part2 b/changes/bug4533_part2 new file mode 100644 index 0000000000..7e0f7c313e --- /dev/null +++ b/changes/bug4533_part2 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix the SOCKET_OK test that we use to tell when socket + creation fails so that it works on Win64. Fixes part of bug + 4533; bugfix on 0.2.2.29-beta. Bug found by wanoskarnet. + diff --git a/src/common/compat.h b/src/common/compat.h index 2db8107a8e..5bf12cdf89 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -400,7 +400,7 @@ typedef int socklen_t; #ifdef MS_WINDOWS #define tor_socket_t intptr_t -#define SOCKET_OK(s) ((unsigned)(s) != INVALID_SOCKET) +#define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET) #else #define tor_socket_t int #define SOCKET_OK(s) ((s) >= 0) |