[vlc-commits] win32: Work around an issue in mingw-w64 5.0.x headers

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Dec 14 17:51:37 2017 +0100| [685f792ff5dc2062458b0141bd321b814853f4df] | committer: Hugo Beauzée-Luyssen

win32: Work around an issue in mingw-w64 5.0.x headers

wincrypt.h needs to be included before iphlpapi.h

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=685f792ff5dc2062458b0141bd321b814853f4df
---

 modules/services_discovery/upnp.hpp | 4 ++++
 src/network/udp.c                   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp
index 39e19cbd56..14286276db 100644
--- a/modules/services_discovery/upnp.hpp
+++ b/modules/services_discovery/upnp.hpp
@@ -31,6 +31,10 @@
 #include <vector>
 #include <string>
 
+#ifdef _WIN32
+#include <windows.h>
+#include <wincrypt.h>
+#endif
 #include <upnp/upnp.h>
 #include <upnp/upnptools.h>
 
diff --git a/src/network/udp.c b/src/network/udp.c
index adc4376db9..6a590b98c3 100644
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -41,6 +41,7 @@
 #ifdef _WIN32
 #   undef EAFNOSUPPORT
 #   define EAFNOSUPPORT WSAEAFNOSUPPORT
+#   include <wincrypt.h>
 #   include <iphlpapi.h>
 #else
 #   include <unistd.h>