conflicts resolved

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);
 }