mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2

Browse source
This commit is contained in:
Nick Mathewson 2012-01-18 15:29:25 -05:00
commit 6d595fa4cf
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/bug4533_part2 Normal file
View file

@ -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.

2
src/common/compat.h
View file

@ -396,7 +396,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)