Commit e9523a98 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #927 from ricnewton/master

Fix cmake build on windows & travis build.
parents 0e0c46ae 5bd5188e
......@@ -42,10 +42,11 @@ if(POLLER STREQUAL "")
else()
if(CMAKE_HOST_WIN32)
set(CMAKE_REQUIRED_INCLUDES winsock2.h)
set(HAVE_SELECT 1)
else()
set(CMAKE_REQUIRED_INCLUDES sys/select.h)
check_function_exists(select HAVE_SELECT)
endif()
check_function_exists(select HAVE_SELECT)
set(CMAKE_REQUIRED_INCLUDES )
if(HAVE_SELECT)
set(POLLER "select")
......
#include "platform.hpp"
#define ZMQ_HAVE_NORM 1
#if defined ZMQ_HAVE_NORM
#include "norm_engine.hpp"
......
......@@ -450,7 +450,7 @@ void zmq::session_base_t::reconnect ()
{
// For delayed connect situations, terminate the pipe
// and reestablish later on
if (pipe && 1 == options.immediate == 1
if (pipe && options.immediate == 1
&& addr->protocol != "pgm" && addr->protocol != "epgm"
&& addr->protocol != "norm") {
pipe->hiccup ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment