summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-01 15:29:19 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-01 15:29:19 +0200
commit0fe7d3c998f65fb93b0f3d15c40d8bc2fe0923ad (patch)
treeedcb770523d63d4acd7114adc5a92ecf0e52ab51 /src
parent651c1adc80ddc724877f2ebedf07d18e21e363f6 (diff)
parent6a0c323bb231a2460c238cd0b93293fcd482f9bc (diff)
conflicts resolved
Diffstat (limited to 'src')
-rw-r--r--src/ctx.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp
index 677253a..65c5316 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -36,12 +36,14 @@
zmq::ctx_t::ctx_t (uint32_t io_threads_) :
no_sockets_notify (false)
{
+ int rc;
+
#ifdef ZMQ_HAVE_WINDOWS
// Intialise Windows sockets. Note that WSAStartup can be called multiple
// times given that WSACleanup will be called for each WSAStartup.
WORD version_requested = MAKEWORD (2, 2);
WSADATA wsa_data;
- int rc = WSAStartup (version_requested, &wsa_data);
+ rc = WSAStartup (version_requested, &wsa_data);
zmq_assert (rc == 0);
zmq_assert (LOBYTE (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.
log_socket = create_socket (ZMQ_PUB);
zmq_assert (log_socket);
- int rc = log_socket->bind ("sys://log");
+ rc = log_socket->bind ("sys://log");
zmq_assert (rc == 0);
}