=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: include: Prefix public header file names with vkd3d.
Alexandre Julliard
julliard at winehq.org
Fri Dec 15 12:24:41 CST 2017
Module: vkd3d
Branch: master
Commit: abff3ca469e971ce544af21f993cd1c85bbdd93a
URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=abff3ca469e971ce544af21f993cd1c85bbdd93a
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Dec 15 15:16:21 2017 +0100
include: Prefix public header file names with vkd3d.
Prevents possible clashes when using vkd3d with external Win32 headers.
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>
---
Makefile.am | 22 +++++++++++-----------
demos/demo.h | 2 +-
demos/demo_win32.h | 2 +-
include/.gitignore | 16 ++++++++--------
include/vkd3d.h | 2 +-
include/{d3d12.idl => vkd3d_d3d12.idl} | 4 ++--
include/{dxgi.idl => vkd3d_dxgi.idl} | 4 ++--
include/{dxgi1_2.idl => vkd3d_dxgi1_2.idl} | 2 +-
include/{dxgi1_3.idl => vkd3d_dxgi1_3.idl} | 2 +-
include/{dxgi1_4.idl => vkd3d_dxgi1_4.idl} | 2 +-
include/{dxgibase.idl => vkd3d_dxgibase.idl} | 2 +-
include/{dxgiformat.idl => vkd3d_dxgiformat.idl} | 0
include/{dxgitype.idl => vkd3d_dxgitype.idl} | 2 +-
include/{unknown.idl => vkd3d_unknown.idl} | 0
tests/d3d12.c | 4 ++--
15 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9e1f854..4d32b2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,22 +3,22 @@ AM_CFLAGS = @VKD3D_CFLAGS@
AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private
widl_headers = \
- include/d3d12.h \
- include/dxgi.h \
- include/dxgi1_2.h \
- include/dxgi1_3.h \
- include/dxgi1_4.h \
- include/dxgibase.h \
- include/dxgiformat.h \
- include/dxgitype.h
+ include/vkd3d_d3d12.h \
+ include/vkd3d_dxgi.h \
+ include/vkd3d_dxgi1_2.h \
+ include/vkd3d_dxgi1_3.h \
+ include/vkd3d_dxgi1_4.h \
+ include/vkd3d_dxgibase.h \
+ include/vkd3d_dxgiformat.h \
+ include/vkd3d_dxgitype.h
vkd3d_public_headers = \
- include/d3d12.h \
include/dummy/rpc.h \
include/dummy/rpcndr.h \
- include/dxgibase.h \
- include/dxgiformat.h \
include/vkd3d.h \
+ include/vkd3d_d3d12.h \
+ include/vkd3d_dxgibase.h \
+ include/vkd3d_dxgiformat.h \
include/vkd3d_shader.h \
include/vkd3d_utils.h \
include/vkd3d_windows.h
diff --git a/demos/demo.h b/demos/demo.h
index dc36d10..4645bd7 100644
--- a/demos/demo.h
+++ b/demos/demo.h
@@ -36,7 +36,7 @@
#include <vkd3d_windows.h>
#define WIDL_C_INLINE_WRAPPERS
#define COBJMACROS
-#include <d3d12.h>
+#include <vkd3d_d3d12.h>
#include <inttypes.h>
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x))
diff --git a/demos/demo_win32.h b/demos/demo_win32.h
index addcc95..3b61bcf 100644
--- a/demos/demo_win32.h
+++ b/demos/demo_win32.h
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <dxgi1_4.h>
+#include <vkd3d_dxgi1_4.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/include/.gitignore b/include/.gitignore
index b7ead08..17852a8 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,11 +1,11 @@
config.h
config.h.in
-d3d12.h
-dxgi.h
-dxgi1_2.h
-dxgi1_3.h
-dxgi1_4.h
-dxgibase.h
-dxgiformat.h
-dxgitype.h
stamp-h1
+vkd3d_d3d12.h
+vkd3d_dxgi.h
+vkd3d_dxgi1_2.h
+vkd3d_dxgi1_3.h
+vkd3d_dxgi1_4.h
+vkd3d_dxgibase.h
+vkd3d_dxgiformat.h
+vkd3d_dxgitype.h
diff --git a/include/vkd3d.h b/include/vkd3d.h
index 941663f..f6872c3 100644
--- a/include/vkd3d.h
+++ b/include/vkd3d.h
@@ -21,7 +21,7 @@
#ifndef VKD3D_NO_WIN32_TYPES
# include "vkd3d_windows.h"
-# include "d3d12.h"
+# include "vkd3d_d3d12.h"
#endif /* VKD3D_NO_WIN32_TYPES */
#include <vulkan/vulkan.h>
diff --git a/include/d3d12.idl b/include/vkd3d_d3d12.idl
similarity index 99%
rename from include/d3d12.idl
rename to include/vkd3d_d3d12.idl
index 07218cd..4242daf 100644
--- a/include/d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -18,9 +18,9 @@
import "vkd3d_windows.h";
-import "dxgibase.idl";
+import "vkd3d_dxgibase.idl";
-#include "unknown.idl"
+#include "vkd3d_unknown.idl"
const UINT D3D12_CS_TGSM_REGISTER_COUNT = 8192;
const UINT D3D12_MAX_ROOT_COST = 64;
diff --git a/include/dxgi.idl b/include/vkd3d_dxgi.idl
similarity index 98%
rename from include/dxgi.idl
rename to include/vkd3d_dxgi.idl
index 746e000..5b80e1f 100644
--- a/include/dxgi.idl
+++ b/include/vkd3d_dxgi.idl
@@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-import "dxgitype.idl";
+import "vkd3d_dxgitype.idl";
-#include "unknown.idl"
+#include "vkd3d_unknown.idl"
typedef enum DXGI_SWAP_EFFECT
{
diff --git a/include/dxgi1_2.idl b/include/vkd3d_dxgi1_2.idl
similarity index 99%
rename from include/dxgi1_2.idl
rename to include/vkd3d_dxgi1_2.idl
index dbee994..e7f951a 100644
--- a/include/dxgi1_2.idl
+++ b/include/vkd3d_dxgi1_2.idl
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-import "dxgi.idl";
+import "vkd3d_dxgi.idl";
typedef enum DXGI_SCALING
{
diff --git a/include/dxgi1_3.idl b/include/vkd3d_dxgi1_3.idl
similarity index 98%
rename from include/dxgi1_3.idl
rename to include/vkd3d_dxgi1_3.idl
index 85a6e1e..88ac0a3 100644
--- a/include/dxgi1_3.idl
+++ b/include/vkd3d_dxgi1_3.idl
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-import "dxgi1_2.idl";
+import "vkd3d_dxgi1_2.idl";
typedef struct DXGI_MATRIX_3X2_F DXGI_MATRIX_3X2_F;
diff --git a/include/dxgi1_4.idl b/include/vkd3d_dxgi1_4.idl
similarity index 98%
rename from include/dxgi1_4.idl
rename to include/vkd3d_dxgi1_4.idl
index 908bd9b..ccd2224 100644
--- a/include/dxgi1_4.idl
+++ b/include/vkd3d_dxgi1_4.idl
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-import "dxgi1_3.idl";
+import "vkd3d_dxgi1_3.idl";
[
local,
diff --git a/include/dxgibase.idl b/include/vkd3d_dxgibase.idl
similarity index 97%
rename from include/dxgibase.idl
rename to include/vkd3d_dxgibase.idl
index 86ba5dc..93f931e 100644
--- a/include/dxgibase.idl
+++ b/include/vkd3d_dxgibase.idl
@@ -18,7 +18,7 @@
import "vkd3d_windows.h";
-import "dxgiformat.idl";
+import "vkd3d_dxgiformat.idl";
cpp_quote("#ifndef DXGI_ERROR_INVALID_CALL")
cpp_quote("#define DXGI_ERROR_INVALID_CALL _HRESULT_TYPEDEF_(0x887a0001)")
diff --git a/include/dxgiformat.idl b/include/vkd3d_dxgiformat.idl
similarity index 100%
rename from include/dxgiformat.idl
rename to include/vkd3d_dxgiformat.idl
diff --git a/include/dxgitype.idl b/include/vkd3d_dxgitype.idl
similarity index 98%
rename from include/dxgitype.idl
rename to include/vkd3d_dxgitype.idl
index aad3f4b..74806c0 100644
--- a/include/dxgitype.idl
+++ b/include/vkd3d_dxgitype.idl
@@ -18,7 +18,7 @@
*/
import "vkd3d_windows.h";
-import "dxgibase.idl";
+import "vkd3d_dxgibase.idl";
typedef enum DXGI_COLOR_SPACE_TYPE
{
diff --git a/include/unknown.idl b/include/vkd3d_unknown.idl
similarity index 100%
rename from include/unknown.idl
rename to include/vkd3d_unknown.idl
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 1d8e625..963ecff 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -41,7 +41,7 @@ typedef int HRESULT;
#include "vkd3d_test.h"
#include "vkd3d_windows.h"
#define WIDL_C_INLINE_WRAPPERS
-#include "d3d12.h"
+#include "vkd3d_d3d12.h"
#include <inttypes.h>
#include <limits.h>
@@ -49,7 +49,7 @@ typedef int HRESULT;
#include <time.h>
#ifdef _WIN32
-# include "dxgi1_4.h"
+# include "vkd3d_dxgi1_4.h"
#else
# include <pthread.h>
# include "vkd3d_utils.h"
More information about the wine-cvs
mailing list