Matteo Bruni : d3dcompiler: Always expect D3D_COMPILER_VERSION to be defined.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ed07d8586fc0ad7bbfd6be1146cf1cee73a082f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4ed07d8586fc0ad7bbfd6be1146cf1cee73a082f

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Tue Nov 12 19:47:23 2019 +0100

d3dcompiler: Always expect D3D_COMPILER_VERSION to be defined.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d10/Makefile.in           | 1 +
 dlls/d3dcompiler_43/reflection.c | 2 +-
 dlls/d3dcompiler_43/utils.c      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index 50807a295a..d54f6f70cb 100644
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -1,6 +1,7 @@
 MODULE    = d3d10.dll
 IMPORTLIB = d3d10
 IMPORTS   = uuid d3d10core d3dcompiler dxgi
+EXTRADEFS = -DD3D_COMPILER_VERSION=0
 PARENTSRC = ../d3dcompiler_43
 
 EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c
index d3d083e8d8..9a230d8d91 100644
--- a/dlls/d3dcompiler_43/reflection.c
+++ b/dlls/d3dcompiler_43/reflection.c
@@ -1807,7 +1807,7 @@ err_out:
 }
 
 /* d3d10 reflection methods. */
-#ifndef D3D_COMPILER_VERSION
+#if !D3D_COMPILER_VERSION
 static inline struct d3dcompiler_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface)
 {
     return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D10ShaderReflection_iface);
diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c
index 27c0ba8c91..1436ed6bf3 100644
--- a/dlls/d3dcompiler_43/utils.c
+++ b/dlls/d3dcompiler_43/utils.c
@@ -758,7 +758,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, __ms
     }
 }
 
-#ifdef D3D_COMPILER_VERSION
+#if D3D_COMPILER_VERSION
 BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var)
 {
     struct hlsl_ir_var *var;