path: root/audio
diff options
authorJames Ross-Gowan <>2016-09-27 22:44:18 +1000
committerJames Ross-Gowan <>2016-09-28 21:38:52 +1000
commit3751065f9740244c95da963c0dd16a0bcd5b419c (patch)
tree78f13a6a1fcde648b14a414f21e82e7564ba9cbc /audio
parentc239b7de7efbe3e87a9c09922c88e6a88777fb80 (diff)
win32: build with -DINITGUID
We always want to use __declspec(selectany) to declare GUIDs, but manually including <initguid.h> in every file that used GUIDs was error-prone. Since all <initguid.h> does is define INITGUID and include <guiddef.h>, we can remove all references to <initguid.h> and just compile with -DINITGUID to get the same effect. Also, this partially reverts 622bcb0 by re-adding libuuid.a to the build, since apparently some GUIDs (such as GUID_NULL) are not declared in the source file, even when INITGUID is set.
Diffstat (limited to 'audio')
2 files changed, 0 insertions, 2 deletions
diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c
index 46843ec5e3..e1b3a9d604 100644
--- a/audio/out/ao_wasapi_changenotify.c
+++ b/audio/out/ao_wasapi_changenotify.c
@@ -17,7 +17,6 @@
* License along with mpv. If not, see <>.
-#include <initguid.h>
#include <wchar.h>
#include "ao_wasapi.h"
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 6218153bea..320bb6767b 100644
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -20,7 +20,6 @@
#include <math.h>
#include <wchar.h>
#include <windows.h>
-#include <initguid.h>
#include <errors.h>
#include <ksguid.h>
#include <ksmedia.h>