-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
29 additions
and
0 deletions.
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
depends/patches/zeromq/0001-fix-build-with-older-mingw64.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
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 |