Józef Kucia : include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: f8c20beede23609eb240499fa657a6f62c8853eb
URL:    http://source.winehq.org/git/vkd3d.git/?a=commit;h=f8c20beede23609eb240499fa...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Fri Dec 15 15:16:20 2017 +0100

include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined.

Allows using vkd3d with other Win32 headers.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/vkd3d.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/vkd3d.h b/include/vkd3d.h
index 8cc9a67..941663f 100644
--- a/include/vkd3d.h
+++ b/include/vkd3d.h
@@ -19,8 +19,11 @@
 #ifndef __VKD3D_H
 #define __VKD3D_H
 
-#include "vkd3d_windows.h"
-#include "d3d12.h"
+#ifndef VKD3D_NO_WIN32_TYPES
+# include "vkd3d_windows.h"
+# include "d3d12.h"
+#endif  /* VKD3D_NO_WIN32_TYPES */
+
 #include <vulkan/vulkan.h>
 #include <stdbool.h>