diff options
| author | Ignacio Casal Quinteiro <qignacio@amazon.com> | 2019-08-06 17:42:15 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-08-12 09:04:50 +0100 |
| commit | 01dfaeb63a45089cd73fe83a4d5bc276369e0f9d (patch) | |
| tree | 894f6b30ac7a6a2b9dfc1858a6e3a6fe27f5dc0b /sys | |
| parent | dabd416165e557b892d322682cc66334746f9a97 (diff) | |
| download | gstreamer-plugins-bad-01dfaeb63a45089cd73fe83a4d5bc276369e0f9d.tar.gz | |
wasapi: fix symbol redefinition build error
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/wasapi/gstwasapiutil.c | 8 | ||||
| -rw-r--r-- | sys/wasapi/gstwasapiutil.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/wasapi/gstwasapiutil.c b/sys/wasapi/gstwasapiutil.c index 94de63835..ef4e0052c 100644 --- a/sys/wasapi/gstwasapiutil.c +++ b/sys/wasapi/gstwasapiutil.c @@ -22,6 +22,14 @@ # include <config.h> #endif +/* Note: initguid.h can not be included in gstwasapiutil.h, otherwise a + * symbol redefinition error will be raised. + * initguid.h must be included in the C file before mmdeviceapi.h + * which is included in gstwasapiutil.h. + */ +#ifdef _MSC_VER +#include <initguid.h> +#endif #include "gstwasapiutil.h" #include "gstwasapidevice.h" diff --git a/sys/wasapi/gstwasapiutil.h b/sys/wasapi/gstwasapiutil.h index 599a60364..715e0db15 100644 --- a/sys/wasapi/gstwasapiutil.h +++ b/sys/wasapi/gstwasapiutil.h @@ -25,9 +25,6 @@ #include <gst/audio/gstaudiosrc.h> #include <gst/audio/gstaudiosink.h> -#ifdef _MSC_VER -#include <initguid.h> -#endif #include <mmdeviceapi.h> #include <audioclient.h> |