mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
ce0118b613
126999ddepends: fix zmq build with mingw < 4.0 (Cory Fields)387879d[depends] ZeroMQ 4.2.2 (fanquake) Pull request description: Update depends ZeroMQ to 4.2.2, the release notes are available [here](https://github.com/zeromq/libzmq/releases). We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release). `--without-documentation` is deprecated and has been replaced with `--without-docs`. `--disable-perf` disables building performance measuring tools, which are enabled by default, see the libzmq [configure.ac](https://github.com/zeromq/libzmq/blob/master/configure.ac#L367). Updated dependencies.md. `--disable-curve-keygen` disable building the curve key generation tool. See [here](https://github.com/zeromq/libzmq/blob/master/configure.ac#L405). Can someone on windows test that this is still working correctly. Maybe @achow101 ? Tree-SHA512: c6c4b15f545b6de21648f05027b5500fca0e6b5b72e791ac9a0aa523c57f2feb5aae94e42531275dddd922e11e462a52f08be1118ba1629c3cae765b18e5d720
31 lines
812 B
Diff
31 lines
812 B
Diff
From 1a159c128c69a42d90819375c06a39994f3fbfc1 Mon Sep 17 00:00:00 2001
|
|
From: Cory Fields <cory-nospam-@coryfields.com>
|
|
Date: Tue, 28 Nov 2017 20:33:25 -0500
|
|
Subject: [PATCH] fix build with older mingw64
|
|
|
|
---
|
|
src/windows.hpp | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/windows.hpp b/src/windows.hpp
|
|
index 99e889d..e69038e 100644
|
|
--- a/src/windows.hpp
|
|
+++ b/src/windows.hpp
|
|
@@ -55,6 +55,13 @@
|
|
#include <winsock2.h>
|
|
#include <windows.h>
|
|
#include <mswsock.h>
|
|
+
|
|
+#if defined __MINGW64_VERSION_MAJOR && __MINGW64_VERSION_MAJOR < 4
|
|
+// Workaround for mingw-w64 < v4.0 which did not include ws2ipdef.h in iphlpapi.h.
|
|
+// Fixed in mingw-w64 by 9bd8fe9148924840d315b4c915dd099955ea89d1.
|
|
+#include <ws2def.h>
|
|
+#include <ws2ipdef.h>
|
|
+#endif
|
|
#include <iphlpapi.h>
|
|
|
|
#if !defined __MINGW32__
|
|
--
|
|
2.7.4
|
|
|