diff options
| author | James Ross-Gowan <rossymiles@gmail.com> | 2016-05-01 01:49:38 +1000 |
|---|---|---|
| committer | James Ross-Gowan <rossymiles@gmail.com> | 2016-05-01 21:10:24 +1000 |
| commit | 622bcb0e37f39f2a542b42587ca442c6600b7414 (patch) | |
| tree | f259c4decae00ab80e047031beabec4c03635e55 /video/out/w32_common.c | |
| parent | 9fda504d18bb8363353c82642f0a84ad0c94dec8 (diff) | |
| download | mpv-622bcb0e37f39f2a542b42587ca442c6600b7414.tar.bz2 mpv-622bcb0e37f39f2a542b42587ca442c6600b7414.tar.xz | |
win32: replace libuuid.a usage with initguid.h
Including initguid.h at the top of a file that uses references to GUIDs
causes the GUIDs to be declared globally with __declspec(selectany). The
'selectany' attribute tells the linker to consolidate multiple
definitions of each GUID, which would be great except that, in Cygwin
and MinGW GCC 6.1, this method of linking makes the GUIDs conflict with
the ones declared in libuuid.a.
Since initguid.h obsoletes libuuid.a in modern compilers that support
__declspec(selectany), add initguid.h to all files that use GUIDs and
remove libuuid.a from the build.
Fixes #3097
Diffstat (limited to 'video/out/w32_common.c')
| -rw-r--r-- | video/out/w32_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 042e81b7fe..e858f037aa 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -15,13 +15,13 @@ * with mpv. If not, see <http://www.gnu.org/licenses/>. */ +#include <initguid.h> #include <stdio.h> #include <limits.h> #include <pthread.h> #include <assert.h> #include <windows.h> #include <windowsx.h> -#include <initguid.h> #include <ole2.h> #include <shobjidl.h> #include <avrt.h> |