Merge branch 'feature/upstream' into develop

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/unictype/test-categ_none.c b/tests/unictype/test-categ_none.c
index 436015a..913011a 100644
--- a/tests/unictype/test-categ_none.c
+++ b/tests/unictype/test-categ_none.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -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;
 }