Eric Pouech : xcopy/tests: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech 
Date:   Thu Feb  3 12:04:52 2022 +0100

xcopy/tests: Enable compilation with long types.

Signed-off-by: Eric Pouech 
Signed-off-by: Alexandre Julliard

---

programs/xcopy/tests/Makefile.in |  1 -
 programs/xcopy/tests/xcopy.c     | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/programs/xcopy/tests/Makefile.in b/programs/xcopy/tests/Makefile.in
index 5fb76fe2d20..3b3d5d5bdc5 100644
--- a/programs/xcopy/tests/Makefile.in
+++ b/programs/xcopy/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = xcopy.exe

C_SRCS = \
diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c
index 17b4406b74c..fa3d5328a1b 100644
--- a/programs/xcopy/tests/xcopy.c
+++ b/programs/xcopy/tests/xcopy.c
@@ -56,18 +56,18 @@ static void test_date_format(void)
     DWORD rc;

rc = runcmd("xcopy /D:20-01-2000 xcopy1 xcopytest");
-    ok(rc == 4, "xcopy /D:d-m-y test returned rc=%u\n", rc);
+    ok(rc == 4, "xcopy /D:d-m-y test returned rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest\xcopy1") == INVALID_FILE_ATTRIBUTES,
        "xcopy should not have created xcopytest\xcopy1\n");

rc = runcmd("xcopy /D:01-20-2000 xcopy1 xcopytest");
-    ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc);
+    ok(rc == 0, "xcopy /D:m-d-y test failed rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest\xcopy1") != INVALID_FILE_ATTRIBUTES,
        "xcopy did not create xcopytest\xcopy1\n");
     DeleteFileA("xcopytest\xcopy1");

rc = runcmd("xcopy /D:1-20-2000 xcopy1 xcopytest");
-    ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc);
+    ok(rc == 0, "xcopy /D:m-d-y test failed rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest\xcopy1") != INVALID_FILE_ATTRIBUTES,
        "xcopy did not create xcopytest\xcopy1\n");
     DeleteFileA("xcopytest\xcopy1");
@@ -78,12 +78,12 @@ static void test_parms_syntax(void)
     DWORD rc;

rc = runcmd("xcopy /H/D:20-01-2000 xcopy1 xcopytest");
-    ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%u\n", rc);
+    ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest\xcopy1") == INVALID_FILE_ATTRIBUTES,
        "xcopy should not have created xcopytest\xcopy1\n");

rc = runcmd("xcopy /D:01-20-2000/H xcopy1 xcopytest");
-    ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%u\n", rc);
+    ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest\xcopy1") != INVALID_FILE_ATTRIBUTES,
        "xcopy did not create xcopytest\xcopy1\n");
     DeleteFileA("xcopytest\xcopy1");
@@ -97,12 +97,12 @@ static void test_parms_syntax(void)
     DeleteFileA("xcopytest\xcopy1"); */

rc = runcmd("xcopy /D/S xcopytest xcopytest2\");
-    ok(rc == 0, "xcopy /D/S test failed rc=%u\n", rc);
+    ok(rc == 0, "xcopy /D/S test failed rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES,
        "xcopy copied empty directory incorrectly\n");

rc = runcmd("xcopy /D/S/E xcopytest xcopytest2\");
-    ok(rc == 0, "xcopy /D/S/E test failed rc=%u\n", rc);
+    ok(rc == 0, "xcopy /D/S/E test failed rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES,
        "xcopy failed to copy empty directory\n");
     RemoveDirectoryA("xcopytest2");