From: Nikolay Sivov Subject: [PATCH] d3dx9: Use proper enum member (Clang) Message-Id: <1448614439-28240-1-git-send-email-nsivov@codeweavers.com> Date: Fri, 27 Nov 2015 11:53:59 +0300 Signed-off-by: Nikolay Sivov --- D3D_INCLUDE_LOCAL and D3DXINC_LOCAL are both 0, but ID3DXInclude::Open() is defined with D3DXINCLUDE_TYPE argument. dlls/d3dx9_36/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e9d893b..e25480d 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -372,7 +372,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); @@ -507,7 +507,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); @@ -630,7 +630,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); -- 2.6.2