mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
e2b24461d4
0388ad0d65b6c9ee802ca641eb01d69fcdd5605d depends: switch zmq to CMake (Cory Fields)
fefb3bbe5b538f8faa59de191914ad0c22c3ade6 depends: add zeromq no librt patch (fanquake)
a522ef15424110f76172b3c0603fa08f7291c9fc depends: add zeromq cmake minimum patch (fanquake)
cbbc229adf4c12ad4bd7edde71425b8ef217edfc depends: add zeromq windows usage patch (fanquake)
2de68d6d388b9a33c57234d3161f6ffc4c2a0246 depends: add zeromq builtin sha1 patch (fanquake)
0c8605253ae887dac316264cb969b752027d277a depends: add zeromq mktemp macos patch (fanquake)
Pull request description:
This picks up a change, which is a switch to building zeromq with CMake. It includes a number of patches, some which have already been upstreamed (see each patch for details).
ACKs for top commit:
hebasto:
ACK 0388ad0d65b6c9ee802ca641eb01d69fcdd5605d.
Tree-SHA512: 5567e432b4e4e0446c41d502bd61810a80b329dea2399b5d9d9f6e79acc450d1c6ba861c8238ba895de98338cfc5dc44ad2bf86ee8c222ecb3fbf47d6eb60da4
55 lines
1.4 KiB
Diff
55 lines
1.4 KiB
Diff
This fixes several instances where _MSC_VER was
|
|
used to determine whether to use afunix.h or not.
|
|
|
|
See https://github.com/zeromq/libzmq/pull/4678.
|
|
--- a/src/ipc_address.hpp
|
|
+++ b/src/ipc_address.hpp
|
|
@@ -7,7 +7,7 @@
|
|
|
|
#include <string>
|
|
|
|
-#if defined _MSC_VER
|
|
+#if defined ZMQ_HAVE_WINDOWS
|
|
#include <afunix.h>
|
|
#else
|
|
#include <sys/socket.h>
|
|
diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp
|
|
index 3f988745..ed2a0645 100644
|
|
--- a/src/ipc_connecter.cpp
|
|
+++ b/src/ipc_connecter.cpp
|
|
@@ -16,7 +16,7 @@
|
|
#include "ipc_address.hpp"
|
|
#include "session_base.hpp"
|
|
|
|
-#ifdef _MSC_VER
|
|
+#if defined ZMQ_HAVE_WINDOWS
|
|
#include <afunix.h>
|
|
#else
|
|
#include <unistd.h>
|
|
diff --git a/src/ipc_listener.cpp b/src/ipc_listener.cpp
|
|
index 50126040..5428579b 100644
|
|
--- a/src/ipc_listener.cpp
|
|
+++ b/src/ipc_listener.cpp
|
|
@@ -17,7 +17,7 @@
|
|
#include "socket_base.hpp"
|
|
#include "address.hpp"
|
|
|
|
-#ifdef _MSC_VER
|
|
+#ifdef ZMQ_HAVE_WINDOWS
|
|
#ifdef ZMQ_IOTHREAD_POLLER_USE_SELECT
|
|
#error On Windows, IPC does not work with POLLER=select, use POLLER=epoll instead, or disable IPC transport
|
|
#endif
|
|
diff --git a/tests/testutil.cpp b/tests/testutil.cpp
|
|
index bdc80283..6f21e8f6 100644
|
|
--- a/tests/testutil.cpp
|
|
+++ b/tests/testutil.cpp
|
|
@@ -7,7 +7,7 @@
|
|
|
|
#if defined _WIN32
|
|
#include "../src/windows.hpp"
|
|
-#if defined _MSC_VER
|
|
+#if defined ZMQ_HAVE_WINDOWS
|
|
#if defined ZMQ_HAVE_IPC
|
|
#include <direct.h>
|
|
#include <afunix.h>
|