Skip to content

L
libzmq
Commit be489709 authored by Martin Sustrik's avatar Martin Sustrik
Browse files
Options

MSVC build brought up-to-date 

Signed-off-by: 's avatarMartin Sustrik <sustrik@250bpm.com>
parent d5f3628a
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 49 deletions
builds/msvc/libzmq/libzmq.vcproj
View file @ be489709
...@@ -250,10 +250,6 @@ ...@@ -250,10 +250,6 @@
RelativePath="..\..\..\src\clock.cpp" RelativePath="..\..\..\src\clock.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\connect_session.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\ctx.cpp" RelativePath="..\..\..\src\ctx.cpp"
> >
...@@ -298,6 +294,14 @@ ...@@ -298,6 +294,14 @@
RelativePath="..\..\..\src\ip.cpp" RelativePath="..\..\..\src\ip.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\ipc_connecter.cpp"
>
</File>
<File
RelativePath="..\..\..\src\ipc_listener.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\kqueue.cpp" RelativePath="..\..\..\src\kqueue.cpp"
> >
...@@ -415,11 +419,11 @@ ...@@ -415,11 +419,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\tcp_listener.cpp" RelativePath="..\..\..\src\tcp_engine.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\tcp_socket.cpp" RelativePath="..\..\..\src\tcp_listener.cpp"
> >
</File> </File>
<File <File
...@@ -427,11 +431,15 @@ ...@@ -427,11 +431,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\transient_session.cpp" RelativePath="..\..\..\src\trie.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\trie.cpp" RelativePath="..\..\..\src\vtcp_connecter.cpp"
>
</File>
<File
RelativePath="..\..\..\src\vtcp_listener.cpp"
> >
</File> </File>
<File <File
...@@ -454,18 +462,6 @@ ...@@ -454,18 +462,6 @@
RelativePath="..\..\..\src\zmq.cpp" RelativePath="..\..\..\src\zmq.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\zmq_connecter.cpp"
>
</File>
<File
RelativePath="..\..\..\src\zmq_engine.cpp"
>
</File>
<File
RelativePath="..\..\..\src\zmq_listener.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\zmq_utils.cpp" RelativePath="..\..\..\src\zmq_utils.cpp"
> >
...@@ -488,10 +484,6 @@ ...@@ -488,10 +484,6 @@
RelativePath="..\..\..\src\atomic_ptr.hpp" RelativePath="..\..\..\src\atomic_ptr.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\blob.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\clock.hpp" RelativePath="..\..\..\src\clock.hpp"
> >
...@@ -504,10 +496,6 @@ ...@@ -504,10 +496,6 @@
RelativePath="..\..\..\src\config.hpp" RelativePath="..\..\..\src\config.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\connect_session.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\ctx.hpp" RelativePath="..\..\..\src\ctx.hpp"
> >
...@@ -564,6 +552,14 @@ ...@@ -564,6 +552,14 @@
RelativePath="..\..\..\src\ip.hpp" RelativePath="..\..\..\src\ip.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\ipc_connecter.hpp"
>
</File>
<File
RelativePath="..\..\..\src\ipc_listener.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\kqueue.hpp" RelativePath="..\..\..\src\kqueue.hpp"
> >
...@@ -676,10 +672,6 @@ ...@@ -676,10 +672,6 @@
RelativePath="..\..\..\src\select.hpp" RelativePath="..\..\..\src\select.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\semaphore.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\session.hpp" RelativePath="..\..\..\src\session.hpp"
> >
...@@ -705,11 +697,11 @@ ...@@ -705,11 +697,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\tcp_listener.hpp" RelativePath="..\..\..\src\tcp_engine.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\tcp_socket.hpp" RelativePath="..\..\..\src\tcp_listener.hpp"
> >
</File> </File>
<File <File
...@@ -717,11 +709,15 @@ ...@@ -717,11 +709,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\transient_session.hpp" RelativePath="..\..\..\src\trie.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\trie.hpp" RelativePath="..\..\..\src\vtcp_connecter.hpp"
>
</File>
<File
RelativePath="..\..\..\src\vtcp_listener.hpp"
> >
</File> </File>
<File <File
...@@ -756,18 +752,6 @@ ...@@ -756,18 +752,6 @@
RelativePath="..\..\..\src\yqueue.hpp" RelativePath="..\..\..\src\yqueue.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\zmq_connecter.hpp"
>
</File>
<File
RelativePath="..\..\..\src\zmq_engine.hpp"
>
</File>
<File
RelativePath="..\..\..\src\zmq_listener.hpp"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>
......
src/tcp_listener.cpp
View file @ be489709
...@@ -183,7 +183,7 @@ zmq::fd_t zmq::tcp_listener_t::accept () ...@@ -183,7 +183,7 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
zmq_assert (s != retired_fd); zmq_assert (s != retired_fd);
fd_t sock = ::accept (s, NULL, NULL); fd_t sock = ::accept (s, NULL, NULL);
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
if (sock == INVALID_SOCKET) if (sock == INVALID_SOCKET) {
wsa_assert (WSAGetLastError () == WSAEWOULDBLOCK || wsa_assert (WSAGetLastError () == WSAEWOULDBLOCK ||
WSAGetLastError () == WSAECONNRESET); WSAGetLastError () == WSAECONNRESET);
return retired_fd; return retired_fd;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment