From: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Tue, 6 Aug 2019 15:42:15 +0000 (+0200)
Subject: wasapi: fix symbol redefinition build error
X-Git-Tag: 1.16.2~51
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01dfaeb63a45089cd73fe83a4d5bc276369e0f9d;p=platform%2Fupstream%2Fgst-plugins-bad.git

wasapi: fix symbol redefinition build error
---

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>