generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-19 00:46:05 +01:00
Code Issues Projects Releases Wiki Activity

MSVC build brought up-to-date

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2011-08-04 07:44:35 +02:00
parent d5f3628ad0
commit be48970977
2 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
builds/msvc/libzmq/libzmq.vcproj
View File

@ -250,10 +250,6 @@
RelativePath="..\..\..\src\clock.cpp"
>
</File>
<File
RelativePath="..\..\..\src\connect_session.cpp"
>
</File>
<File
RelativePath="..\..\..\src\ctx.cpp"
>
@ -298,6 +294,14 @@
RelativePath="..\..\..\src\ip.cpp"
>
</File>
<File
RelativePath="..\..\..\src\ipc_connecter.cpp"
>
</File>
<File
RelativePath="..\..\..\src\ipc_listener.cpp"
>
</File>
<File
RelativePath="..\..\..\src\kqueue.cpp"
>
@ -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
@ -454,18 +462,6 @@
RelativePath="..\..\..\src\zmq.cpp"
>
</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"
>
@ -488,10 +484,6 @@
RelativePath="..\..\..\src\atomic_ptr.hpp"
>
</File>
<File
RelativePath="..\..\..\src\blob.hpp"
>
</File>
<File
RelativePath="..\..\..\src\clock.hpp"
>
@ -504,10 +496,6 @@
RelativePath="..\..\..\src\config.hpp"
>
</File>
<File
RelativePath="..\..\..\src\connect_session.hpp"
>
</File>
<File
RelativePath="..\..\..\src\ctx.hpp"
>
@ -564,6 +552,14 @@
RelativePath="..\..\..\src\ip.hpp"
>
</File>
<File
RelativePath="..\..\..\src\ipc_connecter.hpp"
>
</File>
<File
RelativePath="..\..\..\src\ipc_listener.hpp"
>
</File>
<File
RelativePath="..\..\..\src\kqueue.hpp"
>
@ -676,10 +672,6 @@
RelativePath="..\..\..\src\select.hpp"
>
</File>
<File
RelativePath="..\..\..\src\semaphore.hpp"
>
</File>
<File
RelativePath="..\..\..\src\session.hpp"
>
@ -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>

2
src/tcp_listener.cpp
View File

@ -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;