Merge pull request #927 from ricnewton/master

Fix cmake build on windows & travis build.

CMakeLists.txt

@@ -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)
-                    endif()
                         check_function_exists(select HAVE_SELECT)
+                    endif()
                     set(CMAKE_REQUIRED_INCLUDES )
                     if(HAVE_SELECT)
                         set(POLLER "select")

src/norm_engine.cpp

 
 #include "platform.hpp"
 
-#define ZMQ_HAVE_NORM 1
-
 #if defined ZMQ_HAVE_NORM
 
 #include "norm_engine.hpp"

src/session_base.cpp

@@ -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 ();