summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tests/unictype/test-categ_none.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3142b87761..cf6006cb51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2022-09-04 Bruno Haible <bruno@clisp.org>
+ unictype/category-none tests: Fix a link error on MSVC.
+ * tests/unictype/test-categ_none.c (main): Disable the test on MSVC.
+
+2022-09-04 Bruno Haible <bruno@clisp.org>
+
oset-c++: Fix compilation error with MSVC 14.
* lib/gl_oset.hh: With MSVC, avoid 'friend'.
diff --git a/tests/unictype/test-categ_none.c b/tests/unictype/test-categ_none.c
index 436015ac62..e95feb670f 100644
--- a/tests/unictype/test-categ_none.c
+++ b/tests/unictype/test-categ_none.c
@@ -25,11 +25,18 @@
int
main ()
{
+ /* This test cannot be compiled on platforms on which _UC_CATEGORY_NONE
+ is not exported from the libunistring shared library. For now,
+ MSVC is the only platform where this is a problem. */
+#if !defined _MSC_VER
+
uc_general_category_t ct = _UC_CATEGORY_NONE;
unsigned int c;
for (c = 0; c < 0x110000; c++)
ASSERT (!uc_is_general_category (c, ct));
+#endif
+
return 0;
}