From 615b8f32b230d4e586c56e39283ccb141c3885fb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 18 Jan 2021 09:10:55 +0100 Subject: [PATCH] uninorm tests: Fix compilation error on Cygwin. * tests/uninorm/test-nfc.c (n): Don't define when using a preinstalled libunistring on Windows. * tests/uninorm/test-nfd.c (n): Likewise. * tests/uninorm/test-nfkc.c (n): Likewise. * tests/uninorm/test-nfkd.c (n): Likewise. --- ChangeLog | 9 +++++++++ tests/uninorm/test-nfc.c | 2 +- tests/uninorm/test-nfd.c | 2 +- tests/uninorm/test-nfkc.c | 2 +- tests/uninorm/test-nfkd.c | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c7fa22964..a7a0650fef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-01-18 Bruno Haible + + uninorm tests: Fix compilation error on Cygwin. + * tests/uninorm/test-nfc.c (n): Don't define when using a preinstalled + libunistring on Windows. + * tests/uninorm/test-nfd.c (n): Likewise. + * tests/uninorm/test-nfkc.c (n): Likewise. + * tests/uninorm/test-nfkd.c (n): Likewise. + 2021-01-17 Bruno Haible immutable: Implement on native Windows. diff --git a/tests/uninorm/test-nfc.c b/tests/uninorm/test-nfc.c index 0e908343fc..0a7d857b82 100644 --- a/tests/uninorm/test-nfc.c +++ b/tests/uninorm/test-nfc.c @@ -20,7 +20,7 @@ #include "uninorm.h" -#if !(WOE32DLL || defined __ANDROID__) +#if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFC is defined and links. */ uninorm_t n = UNINORM_NFC; #endif diff --git a/tests/uninorm/test-nfd.c b/tests/uninorm/test-nfd.c index 63a40f9392..e5a06bc49f 100644 --- a/tests/uninorm/test-nfd.c +++ b/tests/uninorm/test-nfd.c @@ -20,7 +20,7 @@ #include "uninorm.h" -#if !(WOE32DLL || defined __ANDROID__) +#if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFD is defined and links. */ uninorm_t n = UNINORM_NFD; #endif diff --git a/tests/uninorm/test-nfkc.c b/tests/uninorm/test-nfkc.c index 0505319c95..52709d7685 100644 --- a/tests/uninorm/test-nfkc.c +++ b/tests/uninorm/test-nfkc.c @@ -20,7 +20,7 @@ #include "uninorm.h" -#if !(WOE32DLL || defined __ANDROID__) +#if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFKC is defined and links. */ uninorm_t n = UNINORM_NFKC; #endif diff --git a/tests/uninorm/test-nfkd.c b/tests/uninorm/test-nfkd.c index 1e20d9a20c..5e374e3423 100644 --- a/tests/uninorm/test-nfkd.c +++ b/tests/uninorm/test-nfkd.c @@ -20,7 +20,7 @@ #include "uninorm.h" -#if !(WOE32DLL || defined __ANDROID__) +#if !(((defined _WIN32 || defined __CYGWIN__) && (HAVE_LIBUNISTRING || WOE32DLL)) || defined __ANDROID__) /* Check that UNINORM_NFKD is defined and links. */ uninorm_t n = UNINORM_NFKD; #endif -- 2.39.5