diff options
| author | Martin Sustrik <sustrik@fastmq.com> | 2009-09-11 16:59:47 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.com> | 2009-09-11 16:59:47 +0200 |
| commit | e940878b3f8ff332df534c4df463cfdf085cc787 (patch) | |
| tree | a15ee553fd3f064a64b4b747035163efd5a83bba | |
| parent | 7be7962f9802b48e66663416097eb76edfa83e1e (diff) | |
build on win32 fixed
| -rw-r--r-- | msvc/libzmq/libzmq.vcproj | 8 | ||||
| -rw-r--r-- | src/socket_base.cpp | 2 | ||||
| -rw-r--r-- | src/tcp_connecter.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/msvc/libzmq/libzmq.vcproj b/msvc/libzmq/libzmq.vcproj index 2a33dbb..27986d4 100644 --- a/msvc/libzmq/libzmq.vcproj +++ b/msvc/libzmq/libzmq.vcproj @@ -242,6 +242,10 @@ > </File> <File + RelativePath="..\..\src\sub.cpp" + > + </File> + <File RelativePath="..\..\src\tcp_connecter.cpp" > </File> @@ -452,6 +456,10 @@ > </File> <File + RelativePath="..\..\src\sub.hpp" + > + </File> + <File RelativePath="..\..\src\tcp_connecter.hpp" > </File> diff --git a/src/socket_base.cpp b/src/socket_base.cpp index f8b1bf7..b4f7d6b 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -142,7 +142,7 @@ int zmq::socket_base_t::setsockopt (int option_, const void *optval_, case ZMQ_SUBSCRIBE: case ZMQ_UNSUBSCRIBE: - errno = ENOTSUP; + errno = EFAULT; return -1; default: diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 80aeea8..304790d 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -109,7 +109,7 @@ zmq::fd_t zmq::tcp_connecter_t::connect () // Assert that the error was caused by the networking problems // rather than 0MQ bug. - zmq_assert (err == ECONNREFUSED); + zmq_assert (err == WSAECONNREFUSED); errno = err; return retired_fd; |