[PATCH v4 03/11] d3d10+d3dcompiler: add PARENTSRC and fix definition conflicts

[Connor McAdams]

This adds d3dcompiler_43 to the PARENTSRC of d3d10 and includes only the
needed files (reflection.c and utils.c) from d3dcompiler_43.

Signed-off-by: Connor McAdams <conmanx360 at gmail.com>
---
 dlls/d3d10/Makefile.in           | 3 +++
 dlls/d3dcompiler_43/reflection.c | 3 +++
 dlls/d3dcompiler_43/utils.c      | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index e6ab7d94ff..e04d46abb9 100644
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -1,10 +1,13 @@
 MODULE    = d3d10.dll
 IMPORTLIB = d3d10
 IMPORTS   = dxguid uuid d3d10core d3dcompiler dxgi
+PARENTSRC = ../d3dcompiler_43
 
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
+        reflection.c \
+        utils.c \
 	d3d10_main.c \
 	effect.c \
 	shader.c \
diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c
index b163fca9e7..8f71bd9ce8 100644
--- a/dlls/d3dcompiler_43/reflection.c
+++ b/dlls/d3dcompiler_43/reflection.c
@@ -18,7 +18,10 @@
  *
  */
 
+#ifdef D3D_COMPILER_VERSION
 #include "initguid.h"
+#endif
+
 #include "d3dcompiler_private.h"
 #include "winternl.h"
 
diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c
index 079bd1c6bc..27c0ba8c91 100644
--- a/dlls/d3dcompiler_43/utils.c
+++ b/dlls/d3dcompiler_43/utils.c
@@ -758,6 +758,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, __ms
     }
 }
 
+#ifdef D3D_COMPILER_VERSION
 BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var)
 {
     struct hlsl_ir_var *var;
@@ -2327,3 +2328,4 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu
     func->intrinsic = intrinsic;
     wine_rb_put(funcs, func->name, &func->entry);
 }
+#endif
-- 
2.20.1