Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
docker-images
Commits
e5e2da7e
Commit
e5e2da7e
authored
Jun 17, 2016
by
Konstantin Pavlov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gcc-mingw' into 'master'
Update mingw patch See merge request !10
parents
ddd8c063
a2a38e2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
16 deletions
+20
-16
vlc-winrt/toolchain-i686/mingw-w64-windows10.patch
vlc-winrt/toolchain-i686/mingw-w64-windows10.patch
+10
-8
vlc-winrt/toolchain-x86_64/mingw-w64-windows10.patch
vlc-winrt/toolchain-x86_64/mingw-w64-windows10.patch
+10
-8
No files found.
vlc-winrt/toolchain-i686/mingw-w64-windows10.patch
View file @
e5e2da7e
From
e99c487742228b7198db15db9292f79eb71d90e3
Mon Sep 17 00:00:00 2001
From
504e345b25603ca2f8896db82a4293351ba7cc4f
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Thu, 16 Jun 2016 15:56:54 +0200
Subject: [PATCH] headers: Adjust header guards for Windows 10
---
mingw-w64-headers/include/iphlpapi.h |
6
+++++-
mingw-w64-headers/include/iphlpapi.h |
8
+++++
+-
-
mingw-w64-headers/include/iprtrmib.h | 5 +++++
mingw-w64-headers/include/mprapi.h | 6 ++++++
mingw-w64-headers/include/nldef.h | 2 +-
4 files changed, 1
7
insertions(+),
2
deletions(-)
4 files changed, 1
8
insertions(+),
3
deletions(-)
diff --git a/mingw-w64-headers/include/iphlpapi.h b/mingw-w64-headers/include/iphlpapi.h
index 03aed33..
b28df42
100644
index 03aed33..
5523f81
100644
--- a/mingw-w64-headers/include/iphlpapi.h
+++ b/mingw-w64-headers/include/iphlpapi.h
@@ -8,
7
+8,
7
@@
@@ -8,
8
+8,
6
@@
#include <winapifamily.h>
-#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00
-
#ifdef __cplusplus
extern "C" {
@@ -19,6 +19,8 @@
extern "C" {
#endif
@@ -19,6 +17,10 @@
extern "C" {
#include <iptypes.h>
#include <tcpestats.h>
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
DWORD WINAPI GetNumberOfInterfaces (PDWORD pdwNumIf);
...
...
vlc-winrt/toolchain-x86_64/mingw-w64-windows10.patch
View file @
e5e2da7e
From
e99c487742228b7198db15db9292f79eb71d90e3
Mon Sep 17 00:00:00 2001
From
504e345b25603ca2f8896db82a4293351ba7cc4f
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Thu, 16 Jun 2016 15:56:54 +0200
Subject: [PATCH] headers: Adjust header guards for Windows 10
---
mingw-w64-headers/include/iphlpapi.h |
6
+++++-
mingw-w64-headers/include/iphlpapi.h |
8
+++++
+-
-
mingw-w64-headers/include/iprtrmib.h | 5 +++++
mingw-w64-headers/include/mprapi.h | 6 ++++++
mingw-w64-headers/include/nldef.h | 2 +-
4 files changed, 1
7
insertions(+),
2
deletions(-)
4 files changed, 1
8
insertions(+),
3
deletions(-)
diff --git a/mingw-w64-headers/include/iphlpapi.h b/mingw-w64-headers/include/iphlpapi.h
index 03aed33..
b28df42
100644
index 03aed33..
5523f81
100644
--- a/mingw-w64-headers/include/iphlpapi.h
+++ b/mingw-w64-headers/include/iphlpapi.h
@@ -8,
7
+8,
7
@@
@@ -8,
8
+8,
6
@@
#include <winapifamily.h>
-#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00
-
#ifdef __cplusplus
extern "C" {
@@ -19,6 +19,8 @@
extern "C" {
#endif
@@ -19,6 +17,10 @@
extern "C" {
#include <iptypes.h>
#include <tcpestats.h>
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 0x0A00
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
DWORD WINAPI GetNumberOfInterfaces (PDWORD pdwNumIf);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment