summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builds/msvc/libzmq/libzmq.vcproj80
-rw-r--r--src/tcp_listener.cpp2
2 files changed, 33 insertions, 49 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 7713f5f..faf58d2 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -251,10 +251,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\connect_session.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\ctx.cpp"
>
</File>
@@ -299,6 +295,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\ipc_connecter.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\ipc_listener.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\kqueue.cpp"
>
</File>
@@ -415,11 +419,11 @@
>
</File>
<File
- RelativePath="..\..\..\src\tcp_listener.cpp"
+ RelativePath="..\..\..\src\tcp_engine.cpp"
>
</File>
<File
- RelativePath="..\..\..\src\tcp_socket.cpp"
+ RelativePath="..\..\..\src\tcp_listener.cpp"
>
</File>
<File
@@ -427,11 +431,15 @@
>
</File>
<File
- RelativePath="..\..\..\src\transient_session.cpp"
+ RelativePath="..\..\..\src\trie.cpp"
>
</File>
<File
- RelativePath="..\..\..\src\trie.cpp"
+ RelativePath="..\..\..\src\vtcp_connecter.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\vtcp_listener.cpp"
>
</File>
<File
@@ -455,18 +463,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\zmq_connecter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\src\zmq_engine.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\src\zmq_listener.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\zmq_utils.cpp"
>
</File>
@@ -489,10 +485,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\blob.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\clock.hpp"
>
</File>
@@ -505,10 +497,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\connect_session.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\ctx.hpp"
>
</File>
@@ -565,6 +553,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\ipc_connecter.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\ipc_listener.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\kqueue.hpp"
>
</File>
@@ -677,10 +673,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\semaphore.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\session.hpp"
>
</File>
@@ -705,11 +697,11 @@
>
</File>
<File
- RelativePath="..\..\..\src\tcp_listener.hpp"
+ RelativePath="..\..\..\src\tcp_engine.hpp"
>
</File>
<File
- RelativePath="..\..\..\src\tcp_socket.hpp"
+ RelativePath="..\..\..\src\tcp_listener.hpp"
>
</File>
<File
@@ -717,11 +709,15 @@
>
</File>
<File
- RelativePath="..\..\..\src\transient_session.hpp"
+ RelativePath="..\..\..\src\trie.hpp"
>
</File>
<File
- RelativePath="..\..\..\src\trie.hpp"
+ RelativePath="..\..\..\src\vtcp_connecter.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\vtcp_listener.hpp"
>
</File>
<File
@@ -756,18 +752,6 @@
RelativePath="..\..\..\src\yqueue.hpp"
>
</File>
- <File
- RelativePath="..\..\..\src\zmq_connecter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\src\zmq_engine.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\src\zmq_listener.hpp"
- >
- </File>
</Filter>
</Files>
<Globals>
diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp
index bcb9a37..a5c6513 100644
--- a/src/tcp_listener.cpp
+++ b/src/tcp_listener.cpp
@@ -183,7 +183,7 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
zmq_assert (s != retired_fd);
fd_t sock = ::accept (s, NULL, NULL);
#ifdef ZMQ_HAVE_WINDOWS
- if (sock == INVALID_SOCKET)
+ if (sock == INVALID_SOCKET) {
wsa_assert (WSAGetLastError () == WSAEWOULDBLOCK ||
WSAGetLastError () == WSAECONNRESET);
return retired_fd;