Changeset View
Changeset View
Standalone View
Standalone View
depends/patches/zeromq/0001-fix-build-with-older-mingw64.patch
| From 1a159c128c69a42d90819375c06a39994f3fbfc1 Mon Sep 17 00:00:00 2001 | From f6866b0f166ad168618aae64c7fbee8775d3eb23 Mon Sep 17 00:00:00 2001 | ||||
| From: Cory Fields <cory-nospam-@coryfields.com> | From: mruddy <6440430+mruddy@users.noreply.github.com> | ||||
| Date: Tue, 28 Nov 2017 20:33:25 -0500 | Date: Sat, 30 Jun 2018 09:44:58 -0400 | ||||
| Subject: [PATCH] fix build with older mingw64 | Subject: [PATCH] fix build with older mingw64 | ||||
| --- | --- | ||||
| src/windows.hpp | 7 +++++++ | src/windows.hpp | 7 +++++++ | ||||
| 1 file changed, 7 insertions(+) | 1 file changed, 7 insertions(+) | ||||
| diff --git a/src/windows.hpp b/src/windows.hpp | diff --git a/src/windows.hpp b/src/windows.hpp | ||||
| index 99e889d..e69038e 100644 | index 6c3839fd..2c32ec79 100644 | ||||
| --- a/src/windows.hpp | --- a/src/windows.hpp | ||||
| +++ b/src/windows.hpp | +++ b/src/windows.hpp | ||||
| @@ -55,6 +55,13 @@ | @@ -58,6 +58,13 @@ | ||||
| #include <winsock2.h> | #include <winsock2.h> | ||||
| #include <windows.h> | #include <windows.h> | ||||
| #include <mswsock.h> | #include <mswsock.h> | ||||
| + | + | ||||
| +#if defined __MINGW64_VERSION_MAJOR && __MINGW64_VERSION_MAJOR < 4 | +#if defined __MINGW64_VERSION_MAJOR && __MINGW64_VERSION_MAJOR < 4 | ||||
| +// Workaround for mingw-w64 < v4.0 which did not include ws2ipdef.h in iphlpapi.h. | +// Workaround for mingw-w64 < v4.0 which did not include ws2ipdef.h in iphlpapi.h. | ||||
| +// Fixed in mingw-w64 by 9bd8fe9148924840d315b4c915dd099955ea89d1. | +// Fixed in mingw-w64 by 9bd8fe9148924840d315b4c915dd099955ea89d1. | ||||
| +#include <ws2def.h> | +#include <ws2def.h> | ||||
| +#include <ws2ipdef.h> | +#include <ws2ipdef.h> | ||||
| +#endif | +#endif | ||||
| #include <iphlpapi.h> | #include <iphlpapi.h> | ||||
| #if !defined __MINGW32__ | #if !defined __MINGW32__ | ||||
| -- | -- | ||||
| 2.7.4 | 2.17.1 | ||||