Piotr Caban : concrt140/tests: Build without -DWINE_NO_LONG_TYPES.

Alexandre Julliard julliard at winehq.org
Mon Feb 14 15:41:28 CST 2022


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Feb 11 20:51:47 2022 +0100

concrt140/tests: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/concrt140/tests/Makefile.in |  1 -
 dlls/concrt140/tests/concrt140.c | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/concrt140/tests/Makefile.in b/dlls/concrt140/tests/Makefile.in
index 4578fb62eb2..e36fc37eb86 100644
--- a/dlls/concrt140/tests/Makefile.in
+++ b/dlls/concrt140/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = concrt140.dll
 
 C_SRCS = \
diff --git a/dlls/concrt140/tests/concrt140.c b/dlls/concrt140/tests/concrt140.c
index 7b3300a3d59..4b24c9cb86f 100644
--- a/dlls/concrt140/tests/concrt140.c
+++ b/dlls/concrt140/tests/concrt140.c
@@ -187,9 +187,9 @@ static void test_Timer(void)
     call_func1(p__Timer__Start, &timer);
     ok(timer.timer != NULL, "timer = NULL\n");
     ret = WaitForSingleObject(callback_called, 1000);
-    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", ret);
     ret = WaitForSingleObject(callback_called, 1000);
-    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", ret);
     call_func1(p__Timer__Stop, &timer);
     ok(!timer.timer, "timer != NULL\n");
     call_func1(p__Timer_dtor, &timer);
@@ -200,9 +200,9 @@ static void test_Timer(void)
     call_func1(p__Timer__Start, &timer);
     ok(timer.timer != NULL, "timer = NULL\n");
     ret = WaitForSingleObject(callback_called, 1000);
-    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", ret);
     ret = WaitForSingleObject(callback_called, 100);
-    ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %d\n", ret);
+    ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", ret);
     call_func1(p__Timer_dtor, &timer);
 
     call_func3(p__Timer_ctor, &timer, 0, TRUE);
@@ -210,9 +210,9 @@ static void test_Timer(void)
     call_func1(p__Timer__Start, &timer);
     ok(timer.timer != NULL, "timer = NULL\n");
     ret = WaitForSingleObject(callback_called, 1000);
-    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret);
+    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", ret);
     ret = WaitForSingleObject(callback_called, 100);
-    ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %d\n", ret);
+    ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", ret);
     call_func1(p__Timer__Stop, &timer);
     ok(!timer.timer, "timer != NULL\n");
     call_func1(p__Timer_dtor, &timer);




More information about the wine-cvs mailing list