Dmitry Timoshkov : d2d1/tests: Fix compilation with clang.

Alexandre Julliard julliard at winehq.org
Tue Jul 5 15:56:15 CDT 2022


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

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Tue Jul  5 08:27:54 2022 +0300

d2d1/tests: Fix compilation with clang.

../wine.src/dlls/d2d1/tests/d2d1.c:11078:11: error: cannot combine with previous 'type-name' declaration specifier
    INT32 _int32;
          ^
../wine.src/dlls/d2d1/tests/d2d1.c:11078:5: warning: declaration does not declare anything [-Wmissing-declarations]
    INT32 _int32;
    ^~~~~~~~~~~~

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d2d1/tests/d2d1.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 1a964475168..3a38d593625 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -11082,7 +11082,7 @@ static void test_effect_properties(BOOL d3d11)
     UINT32 count, data;
     WCHAR buffer[128];
     float mat[20];
-    INT32 _int32;
+    INT32 val;
     CLSID clsid;
     BOOL cached;
     HRESULT hr;
@@ -11181,9 +11181,9 @@ static void test_effect_properties(BOOL d3d11)
     ok(!wcscmp(buffer, L"Int32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer));
     prop_type = ID2D1Effect_GetType(effect, index);
     ok(prop_type == D2D1_PROPERTY_TYPE_INT32, "Unexpected type %u.\n", prop_type);
-    hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&_int32, sizeof(_int32));
+    hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&val, sizeof(val));
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
-    ok(_int32 == -2, "Unexpected value %d.\n", _int32);
+    ok(val == -2, "Unexpected value %d.\n", val);
 
     /* UInt32 property. */
     index = ID2D1Effect_GetPropertyIndex(effect, L"UInt32Prop");




More information about the wine-cvs mailing list