0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00

Problem: Windows IPC check broken (check_protocol)

Solution: Fix the preprocessor check from || to &&
This commit is contained in:
hitstergtd 2016-04-22 19:55:08 +01:00
parent 23e42526eb
commit 7feb1e49fc

View File

@ -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"