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

Problem: Windows IPC check broken (check_protocol)
This commit is contained in:
Constantin Rack 2016-04-22 21:24:07 +02:00
commit ad4e091a5a

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"