Fix SOCKET_OK test on win64.

Bugfix on 0.2.2.29-beta; partial fix for 4533; found by wanoskarnet

diff --git a/changes/bug4533_part2 b/changes/bug4533_part2
new file mode 100644 (file)
index 0000000..7e0f7c3
--- /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 e0b074cf5315295de7907100c6e3051d6567fc16..d2f1fd12959a5ba267b14a768ef3cc5b57c62dd4 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -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)