Skip to content
Snippets Groups Projects
Commit 6d595fa4 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

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

parents 676bba8e dd4b1a2a
No related branches found
No related tags found
No related merge requests found
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.
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment