Merge pull request #1103 from ricnewton/master

Fix windows build

CMakeLists.txt

@@ -419,6 +419,8 @@ set(cxx-sources
         session_base.cpp
         signaler.cpp
         socket_base.cpp
+        socks.cpp
+        socks_connecter.cpp
         stream.cpp
         stream_engine.cpp
         sub.cpp

src/socks.cpp

@@ -18,14 +18,17 @@
 */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
 
 #include "err.hpp"
 #include "platform.hpp"
 #include "socks.hpp"
 #include "tcp.hpp"
 
+#ifndef ZMQ_HAVE_WINDOWS
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+
 zmq::socks_greeting_t::socks_greeting_t (uint8_t method_) :
     num_methods (1)
 {

src/socks_connecter.hpp

@@ -102,7 +102,7 @@ namespace zmq
 
         //  Get the file descriptor of newly created connection. Returns
         //  retired_fd if the connection was unsuccessfull.
-        int check_proxy_connection ();
+        zmq::fd_t check_proxy_connection ();
 
         socks_greeting_encoder_t greeting_encoder;
         socks_choice_decoder_t choice_decoder;