Merge pull request #1915 from hitstergtd/checkproto-windows-fix

Problem: Windows IPC check broken (check_protocol)

Merge pull request #1915 from hitstergtd/checkproto-windows-fix
Problem: Windows IPC check broken (check_protocol)
ad4e091a · Constantin Rack · 0ece425d · 7feb1e49 · ad4e091a
Commit ad4e091a authored Apr 22, 2016 by Constantin Rack
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

socket_base.cpp src/socket_base.cpp +1 -1

No files found.
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -271,7 +271,7 @@ int zmq::socket_base_t::check_protocol (const std::string &protocol_)
 {
    //  First check out whether the protocol is something we are aware of.
    if (protocol_ != "inproc"
-#if !defined ZMQ_HAVE_WINDOWS || !defined ZMQ_HAVE_OPENVMS
+#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
    &&  protocol_ != "ipc"
 #endif
    &&  protocol_ != "tcp"