From 8fdc85b1120c0629b53f52fd5181ae18acdc54cc Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Fri, 10 May 2019 11:43:00 +0200 Subject: [PATCH] Unify define for _WIN32 in tests --- libarchive/test/test_entry.c | 2 +- libarchive/test/test_read_format_rar5.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libarchive/test/test_entry.c b/libarchive/test/test_entry.c index ddc1213aa..0cf13e825 100644 --- a/libarchive/test/test_entry.c +++ b/libarchive/test/test_entry.c @@ -354,7 +354,7 @@ DEFINE_TEST(test_entry) archive_entry_fflags(e, &set, &clear); assertEqualInt(UF_HIDDEN, set); assertEqualInt(UF_NODUMP | UF_IMMUTABLE | UF_APPEND, clear); -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) archive_entry_copy_fflags_text_w(e, L"rdonly,hidden,nosystem"); archive_entry_fflags(e, &set, &clear); assertEqualInt(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN, set); diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c index fe2661de1..d87d8d444 100644 --- a/libarchive/test/test_read_format_rar5.c +++ b/libarchive/test/test_read_format_rar5.c @@ -1102,7 +1102,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_READONLY; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_READONLY; #endif assertEqualInt(flag, set & flag); @@ -1114,7 +1114,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_HIDDEN; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_HIDDEN; #endif assertEqualInt(flag, set & flag); @@ -1126,7 +1126,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_SYSTEM;; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_SYSTEM; #endif assertEqualInt(flag, set & flag); @@ -1138,7 +1138,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_READONLY | UF_HIDDEN; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN; #endif assertEqualInt(flag, set & flag); @@ -1150,7 +1150,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_READONLY; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_READONLY; #endif assertEqualInt(flag, set & flag); @@ -1162,7 +1162,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_HIDDEN; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_HIDDEN; #endif assertEqualInt(flag, set & flag); @@ -1174,7 +1174,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_SYSTEM; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_SYSTEM; #endif assertEqualInt(flag, set & flag); @@ -1186,7 +1186,7 @@ DEFINE_TEST(test_read_format_rar5_fileattr) archive_entry_fflags(ae, &set, &clear); #if defined(__FreeBSD__) flag = UF_READONLY | UF_HIDDEN; -#elif defined(__WIN32) && !defined(CYGWIN) +#elif defined(_WIN32) && !defined(CYGWIN) flag = FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN; #endif assertEqualInt(flag, set & flag); -- 2.47.2