Windows build fixes

Author: eile

CMakeLists.txt

@@ -44,10 +44,14 @@ if(Boost_VERSION GREATER 105799)
   add_subproject(cppnetlib ${PROJECT_SOURCE_DIR}/cppnetlib) # from .gitmodules
   common_find_package(cppnetlib SYSTEM NO_DEFAULT_PATH)
 endif()
-common_find_package(ZeroMQ) # new-ish CMake-based build
-if(NOT ZeroMQ_FOUND)
-  common_find_package(libzmq 4 REQUIRED) # old-ish autopain/pkgconfig build
-  set(ZeroMQ_LIBRARY ${libzmq_LIBRARIES})
+if(TARGET libzmq)
+  set(ZeroMQ_LIBRARY libzmq)
+else()
+  common_find_package(ZeroMQ) # new-ish CMake-based build
+  if(NOT ZeroMQ_FOUND)
+    common_find_package(libzmq 4 REQUIRED) # old-ish autopain/pkgconfig build
+    set(ZeroMQ_LIBRARY ${libzmq_LIBRARIES})
+  endif()
 endif()
 common_find_package(Servus REQUIRED)
 common_find_package(Threads REQUIRED)

zeroeq/detail/context.h

@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <zeroeq/api.h>
 #include <zeroeq/types.h>
 
 #include <memory>
@@ -16,6 +17,6 @@ namespace detail
 /** @return the current ZeroMQ context. Users need to hold onto this context to
  *          extend its lifetime to all sockets created from the context.
  */
-zmq::ContextPtr getContext();
+ZEROEQ_API zmq::ContextPtr getContext();
 }
 }

zeroeq/detail/sender.h

@@ -20,15 +20,15 @@ class Sender
     zmq::ContextPtr _context; // must be private before socket
 
 public:
-    Sender(const URI& uri_, const int type);
-    Sender(const URI& uri_, const int type, const std::string service,
-           const std::string& session);
-    ~Sender();
+    ZEROEQ_API Sender(const URI& uri_, const int type);
+    ZEROEQ_API Sender(const URI& uri_, const int type,
+                      const std::string service, const std::string& session);
+    ZEROEQ_API ~Sender();
 
     std::string getAddress() const;
 
     void initURI();
-    void announce();
+    ZEROEQ_API void announce();
     void addSockets(std::vector<zeroeq::detail::Socket>& entries);
 
     const std::string& getSession() const { return _session; }

zeroeq/http/request.h

@@ -3,10 +3,11 @@
  *                     Raphael.Dumusc@epfl.ch
  */
 
-#ifndef ZEROEQ_HTTP_REQUEST_H
-#define ZEROEQ_HTTP_REQUEST_H
+#pragma once
 
-#include <string>
+#include <zeroeq/types.h>
+
+#include <string> // member
 
 namespace zeroeq
 {
@@ -56,5 +57,3 @@ struct Request
 };
 }
 }
-
-#endif

zeroeq/http/requestHandler.cpp

@@ -10,10 +10,11 @@
 #include <zeroeq/log.h>
 #include <zeroeq/uri.h>
 
+#include <zmq.h>
+
 #include <future>
 #include <memory> // shared_from_this
 #include <stdexcept>
-#include <zmq.h>
 
 namespace zeroeq
 {
@@ -137,7 +138,7 @@ struct ConnectionHandler : std::enable_shared_from_this<ConnectionHandler>
             return;
         }
 
-        _body.append(std::begin(range), size);
+        _body.append(&range[0], size);
         _size -= size;
         if (_size > 0)
             _readChunk(connection, method_);

zeroeq/types.h

@@ -17,6 +17,9 @@
 #ifdef _WIN32
 #define NOMINMAX
 #include <winsock2.h> // SOCKET
+#ifdef DELETE
+#undef DELETE
+#endif
 #endif
 
 /**