[PATCH vkd3d 2/4] include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined.

Józef Kucia joseph.kucia at gmail.com
Fri Dec 15 08:16:20 CST 2017


From: Józef Kucia <jkucia at codeweavers.com>

Allows using vkd3d with other Win32 headers.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 include/vkd3d.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/vkd3d.h b/include/vkd3d.h
index 8cc9a6799375..941663fcacee 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>
 
-- 
2.13.6




More information about the wine-devel mailing list