Prefer __CYGWIN__ over CYGWIN definition

The cygwin FAQ states that __CYGWIN__ is defined when building for a
Cygwin environment. Only a few test files check (inconsistently) for
CYGWIN, so adjust them to the recommended __CYGWIN__ definition.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/cpio/test/test_format_newc.c b/cpio/test/test_format_newc.c
index 0d59c173fa46e70647a728eddb2a3663c53fd805..33aa16d07a815b11444af2f048f2e1deca6570bf 100644 (file)
--- a/cpio/test/test_format_newc.c
+++ b/cpio/test/test_format_newc.c
@@ -219,7 +219,7 @@ DEFINE_TEST(test_format_newc)
                assert(is_hex(e, 110));
                assertEqualMem(e + 0, "070701", 6); /* Magic */
                assert(is_hex(e + 6, 8)); /* ino */
-#if defined(_WIN32) && !defined(CYGWIN)
+#if defined(_WIN32) && !defined(__CYGWIN__)
                /* Mode: Group members bits and others bits do not work. */
                assertEqualInt(0xa180, from_hex(e + 14, 8) & 0xffc0);
 #else

diff --git a/cpio/test/test_option_a.c b/cpio/test/test_option_a.c
index e6b87948c65acfeb8b3406cd16bfad982467383f..28e5b73765d7670a3416cf30b27b67d8e8a4192a 100644 (file)
--- a/cpio/test/test_option_a.c
+++ b/cpio/test/test_option_a.c
@@ -52,7 +52,7 @@ test_create(void)
                 * #ifdef this section out.  Most of the test below is
                 * still valid. */
                memset(&times, 0, sizeof(times));
-#if defined(_WIN32) && !defined(CYGWIN)
+#if defined(_WIN32) && !defined(__CYGWIN__)
                times.actime = 86400;
                times.modtime = 86400;
 #else

diff --git a/libarchive/test/test_entry.c b/libarchive/test/test_entry.c
index 38c406e35b5a66de3fadc56855439e3f75768f05..9b21b83ecdfb84a3203304ff65d766b3898ccba8 100644 (file)
--- a/libarchive/test/test_entry.c
+++ b/libarchive/test/test_entry.c
@@ -436,7 +436,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_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c
index 009c9a8db1e173f04d1911f167b23c0f51defa1a..7597f4b6f6eb45b13d04b39a7edfe12a93d0c7cf 100644 (file)
--- a/libarchive/test/test_read_disk_directory_traversals.c
+++ b/libarchive/test/test_read_disk_directory_traversals.c
@@ -39,7 +39,7 @@ atimeIsUpdated(void)
 {
        const char *fn = "fs_noatime";
        struct stat st;
-#if defined(_WIN32) && !defined(CYGWIN)
+#if defined(_WIN32) && !defined(__CYGWIN__)
        char *buff = NULL;
        char *ptr;
        int r;

diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c
index 6969753545654a04efe434afb07d0ded18171e62..fd233277bc1b3f3220871d0e36090088797883f8 100644 (file)
--- a/libarchive/test/test_read_format_rar5.c
+++ b/libarchive/test/test_read_format_rar5.c
@@ -1126,7 +1126,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);
@@ -1138,7 +1138,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);
@@ -1150,7 +1150,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);
@@ -1162,7 +1162,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);
@@ -1174,7 +1174,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);
@@ -1186,7 +1186,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);
@@ -1198,7 +1198,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);
@@ -1210,7 +1210,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);

diff --git a/tar/test/test_option_C_mtree.c b/tar/test/test_option_C_mtree.c
index b6ab159941d89251f5859ec65bc6e6186b9949b7..6cbac38fcac53773eb80792db9aa28ee34d1b523 100644 (file)
--- a/tar/test/test_option_C_mtree.c
+++ b/tar/test/test_option_C_mtree.c
@@ -17,7 +17,7 @@ DEFINE_TEST(test_option_C_mtree)
        p0 = NULL;
        char *content = "./foo type=file uname=root gname=root mode=0755\n";
        char *filename = "output.tar";
-#if defined(_WIN32) && !defined(CYGWIN)
+#if defined(_WIN32) && !defined(__CYGWIN__)
        char *p;
 #endif
 
@@ -32,7 +32,7 @@ DEFINE_TEST(test_option_C_mtree)
        assertMakeDir("bar", 0775);
        assertMakeFile("bar/foo", 0777, "abc");
 
-#if defined(_WIN32) && !defined(CYGWIN)
+#if defined(_WIN32) && !defined(__CYGWIN__)
        p = absolute_path;
        while(*p != '\0') {
                if (*p == '/')