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

conflicts resolved

Browse Source
This commit is contained in:
Martin Sustrik 2010-09-01 15:29:19 +02:00
commit 0fe7d3c998
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,10 +181,18 @@
RelativePath="..\..\..\src\ctx.cpp" RelativePath="..\..\..\src\ctx.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\decoder.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\devpoll.cpp" RelativePath="..\..\..\src\devpoll.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\encoder.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\epoll.cpp" RelativePath="..\..\..\src\epoll.cpp"
> >
@ -357,14 +365,6 @@
RelativePath="..\..\..\src\zmq_connecter.cpp" RelativePath="..\..\..\src\zmq_connecter.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\zmq_decoder.cpp"
>
</File>
<File
RelativePath="..\..\..\src\zmq_encoder.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\zmq_engine.cpp" RelativePath="..\..\..\src\zmq_engine.cpp"
> >
@ -639,14 +639,6 @@
RelativePath="..\..\..\src\zmq_connecter.hpp" RelativePath="..\..\..\src\zmq_connecter.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\zmq_decoder.hpp"
>
</File>
<File
RelativePath="..\..\..\src\zmq_encoder.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\zmq_engine.hpp" RelativePath="..\..\..\src\zmq_engine.hpp"
> >

6
src/ctx.cpp
View File

@ -36,12 +36,14 @@
zmq::ctx_t::ctx_t (uint32_t io_threads_) : zmq::ctx_t::ctx_t (uint32_t io_threads_) :
no_sockets_notify (false) no_sockets_notify (false)
{ {
int rc;
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
// Intialise Windows sockets. Note that WSAStartup can be called multiple // Intialise Windows sockets. Note that WSAStartup can be called multiple
// times given that WSACleanup will be called for each WSAStartup. // times given that WSACleanup will be called for each WSAStartup.
WORD version_requested = MAKEWORD (2, 2); WORD version_requested = MAKEWORD (2, 2);
WSADATA wsa_data; WSADATA wsa_data;
int rc = WSAStartup (version_requested, &wsa_data); rc = WSAStartup (version_requested, &wsa_data);
zmq_assert (rc == 0); zmq_assert (rc == 0);
zmq_assert (LOBYTE (wsa_data.wVersion) == 2 && zmq_assert (LOBYTE (wsa_data.wVersion) == 2 &&
HIBYTE (wsa_data.wVersion) == 2); HIBYTE (wsa_data.wVersion) == 2);
@ -70,7 +72,7 @@ zmq::ctx_t::ctx_t (uint32_t io_threads_) :
// Create the logging infrastructure. // Create the logging infrastructure.
log_socket = create_socket (ZMQ_PUB); log_socket = create_socket (ZMQ_PUB);
zmq_assert (log_socket); zmq_assert (log_socket);
int rc = log_socket->bind ("sys://log"); rc = log_socket->bind ("sys://log");
zmq_assert (rc == 0); zmq_assert (rc == 0);
} }