From 7feb1e49fc416a887443a57d43cb6ca184f0938c Mon Sep 17 00:00:00 2001 From: hitstergtd Date: Fri, 22 Apr 2016 19:55:08 +0100 Subject: [PATCH] Problem: Windows IPC check broken (check_protocol) Solution: Fix the preprocessor check from || to && --- src/socket_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 75b3758d..949cdd6a 100644 --- 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"