Fix windows build

This commit is contained in:
Richard Newton 2014-06-23 13:10:43 +01:00
parent de3832d2f8
commit 369725ab8f
3 changed files with 8 additions and 3 deletions

View File

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

View File

@ -18,14 +18,17 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include "err.hpp" #include "err.hpp"
#include "platform.hpp" #include "platform.hpp"
#include "socks.hpp" #include "socks.hpp"
#include "tcp.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_) : zmq::socks_greeting_t::socks_greeting_t (uint8_t method_) :
num_methods (1) num_methods (1)
{ {

View File

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