=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: include: Avoid including vkd3d_windows.h when real windows.h is included.
Alexandre Julliard
julliard at winehq.org
Fri Dec 15 12:24:41 CST 2017
Module: vkd3d
Branch: master
Commit: 6671e79082998fec1ad665f9b24ab2d7577855a0
URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=6671e79082998fec1ad665f9b24ab2d7577855a0
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Dec 15 15:16:22 2017 +0100
include: Avoid including vkd3d_windows.h when real windows.h is included.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/vkd3d_windows.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h
index 09c30f6..3b1f92a 100644
--- a/include/vkd3d_windows.h
+++ b/include/vkd3d_windows.h
@@ -18,6 +18,7 @@
#ifndef __VKD3D_WINDOWS_H
#define __VKD3D_WINDOWS_H
+#ifndef _INC_WINDOWS
#if !defined(_WIN32) || defined(__WIDL__)
@@ -238,4 +239,5 @@ extern "C++" \
#endif
#endif /* DEFINE_ENUM_FLAG_OPERATORS */
+#endif /* _INC_WINDOWS */
#endif /* __VKD3D_WINDOWS_H */
More information about the wine-cvs
mailing list