Unify define for _WIN32 in tests

diff --git a/libarchive/test/test_entry.c b/libarchive/test/test_entry.c
index ddc1213aad50bf969a13dab789a69eae76d9a1ad..0cf13e825afc6dd3f19c3065cd76e78694ebad9b 100644 (file)
--- 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 fe2661de13c32c157b9c3f8b2f01332c7e0fb59c..d87d8d4442d59ff4db4777715650d03cecee5d03 100644 (file)
--- 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);