[vlc-commits] vout: win32 common: Delay inclusion of dxgidebug.h

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Dec 12 12:56:38 2016 +0100| [269d285a59e21b6d6abe3d9ad4057566266b65d6] | committer: Hugo Beauzée-Luyssen

vout: win32 common: Delay inclusion of dxgidebug.h

Since we need to have INITGUID defined, including it before common.h and
therefore before all module specific headers would cause too much GUIDs
to be defined, causing potential multiple definitions

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=269d285a59e21b6d6abe3d9ad4057566266b65d6
---

 modules/video_output/win32/common.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index 0b11bba..ee444f9 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -39,13 +39,14 @@
 #include <assert.h>
 
 #define COBJMACROS
+#include <shobjidl.h>
+
+#include "common.h"
+
 #if !defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
 # include <initguid.h>
 # include <dxgidebug.h>
 #endif
-#include <shobjidl.h>
-
-#include "common.h"
 
 static void CommonChangeThumbnailClip(vout_display_t *, bool show);
 #if !VLC_WINSTORE_APP