lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-08 17:22:05 +03:00
Code Activity

c32*: Optionally enforce ISO C 23 semantics of char32_t.

Browse Source 
* lib/lc-charset-unicode.h: New file.
* lib/lc-charset-unicode.c: New file.
* modules/uchar-c23: New file.
* lib/uchar.in.h (char32_t): Add comment.
* lib/mbrtoc32.c: Include lc-charset-unicode.h.
(mbrtoc32): If char32_t is Unicode and wchar_t is not, invoke
locale_encoding_to_unicode.
* lib/btoc32.c: Include lc-charset-unicode.h.
(btoc32): If char32_t is Unicode and wchar_t is not, invoke
locale_encoding_to_unicode.
* lib/c32rtomb.c: Include lc-charset-unicode.h.
(c32rtomb): If char32_t is Unicode and wchar_t is not, invoke
unicode_to_locale_encoding.
* lib/c32tob.c: Include lc-charset-unicode.h.
(c32tob): If char32_t is Unicode and wchar_t is not, invoke
unicode_to_locale_encoding.
* lib/mbsnrtoc32s.c: If char32_t is Unicode and wchar_t is not, don't
use mbsnrtowcs.
* lib/mbsrtoc32s.c: If char32_t is Unicode and wchar_t is not, don't use
mbsrtowcs.
* lib/c32snrtombs.c: If char32_t is Unicode and wchar_t is not, don't
use wcsnrtombs.
* lib/c32srtombs.c: If char32_t is Unicode and wchar_t is not, don't use
wcsrtombs.
* lib/c32is-impl.h: Include lc-charset-unicode.h.
(FUNC): If char32_t is Unicode and wchar_t is not, use UCS_FUNC.
* lib/c32to-impl.h: Include lc-charset-unicode.h.
(FUNC): If char32_t is Unicode and wchar_t is not, use UCS_FUNC.
* lib/c32width.c: Include lc-charset-unicode.h.
(c32width): If char32_t is Unicode and wchar_t is not, use uc_width.
* tests/test-mbrtoc32.c: Include <wchar.h>.
(main): Skip GB18030 tests on NetBSD and Solaris. If
GL_CHAR32_T_IS_UNICODE, expect Unicode encoding for the char32_t values.
* tests/test-mbrtoc32-w32.c: Include <wchar.h>.
(test_one_locale): Simplify.
* tests/test-c32rtomb.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32rtomb.sh: Update.
* tests/test-mbsnrtoc32s.c: Include <wchar.h>.
(main): Skip GB18030 tests on NetBSD and Solaris.
* tests/test-mbsrtoc32s.c: Include <wchar.h>.
(main): Skip GB18030 tests on NetBSD and Solaris.
* tests/test-mbstoc32s.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32snrtombs.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32srtombs.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32stombs.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isalnum.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isalnum.sh: Update.
* tests/test-c32isalpha.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32isalpha.sh: Update.
* tests/test-c32isblank.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isblank.sh: Update.
* tests/test-c32iscntrl.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32iscntrl.sh: Update.
* tests/test-c32isdigit.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isdigit.sh: Update.
* tests/test-c32isgraph.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32isgraph.sh: Update.
* tests/test-c32islower.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32islower.sh: Update.
* tests/test-c32isprint.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32isprint.sh: Update.
* tests/test-c32ispunct.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32ispunct.sh: Update.
* tests/test-c32isspace.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isspace.sh: Update.
* tests/test-c32isupper.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isupper.sh: Update.
* tests/test-c32isxdigit.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isxdigit.sh: Update.
* tests/test-c32tolower.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32tolower.sh: Update.
* tests/test-c32toupper.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32toupper.sh: Update.
* modules/mbrtoc32 (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbrtoc32-tests (Makefile.am): Link test-mbrtoc32 with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/btoc32 (Link): New section.
* modules/btoc32-tests (Makefile.am): Link test-btoc32 with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32rtomb (Link): New section.
* modules/c32rtomb-tests (Makefile.am): Link test-c32rtomb with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32tob (Link): New section.
* modules/mbsnrtoc32s (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbsnrtoc32s-tests (Makefile.am): Link test-mbsnrtoc32s with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/mbsrtoc32s (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbsrtoc32s-tests (Makefile.am): Link test-mbsrtoc32s with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/mbstoc32s (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbstoc32s-tests (Makefile.am): Link test-mbstoc32s with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32snrtombs (Link): New section.
* modules/c32snrtombs-tests (Makefile.am): Link test-c32snrtombs with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32srtombs (Link): New section.
* modules/c32srtombs-tests (Makefile.am): Link test-c32srtombs with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32stombs (Link): New section.
* modules/c32stombs-tests (Makefile.am): Link test-c32stombs with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32isalnum (Link): Add $(LIBC32CONV).
* modules/c32isalnum-tests (Makefile.am): Link test-c32isalnum with
$(LIBC32CONV).
* modules/c32isalpha (Link): Add $(LIBC32CONV).
* modules/c32isalpha-tests (Makefile.am): Link test-c32isalpha with
$(LIBC32CONV).
* modules/c32isblank (Link): Add $(LIBC32CONV).
* modules/c32isblank-tests (Makefile.am): Link test-c32isblank with
$(LIBC32CONV).
* modules/c32iscntrl (Link): Add $(LIBC32CONV).
* modules/c32iscntrl-tests (Makefile.am): Link test-c32iscntrl with
$(LIBC32CONV).
* modules/c32isdigit (Link): Add $(LIBC32CONV).
* modules/c32isdigit-tests (Makefile.am): Link test-c32isdigit with
$(LIBC32CONV).
* modules/c32isgraph (Link): Add $(LIBC32CONV).
* modules/c32isgraph-tests (Makefile.am): Link test-c32isgraph with
$(LIBC32CONV).
* modules/c32islower (Link): Add $(LIBC32CONV).
* modules/c32islower-tests (Makefile.am): Link test-c32islower with
$(LIBC32CONV).
* modules/c32isprint (Link): Add $(LIBC32CONV).
* modules/c32isprint-tests (Makefile.am): Link test-c32isprint with
$(LIBC32CONV).
* modules/c32ispunct (Link): Add $(LIBC32CONV).
* modules/c32ispunct-tests (Makefile.am): Link test-c32ispunct with
$(LIBC32CONV).
* modules/c32isspace (Link): Add $(LIBC32CONV).
* modules/c32isspace-tests (Makefile.am): Link test-c32isspace with
$(LIBC32CONV).
* modules/c32isupper (Link): Add $(LIBC32CONV).
* modules/c32isupper-tests (Makefile.am): Link test-c32isupper with
$(LIBC32CONV).
* modules/c32isxdigit (Link): Add $(LIBC32CONV).
* modules/c32isxdigit-tests (Makefile.am): Link test-c32isxdigit with
$(LIBC32CONV).
* modules/c32tolower (Link): Add $(LIBC32CONV).
* modules/c32tolower-tests (Makefile.am): Link test-c32tolower with
$(LIBC32CONV).
* modules/c32toupper (Link): Add $(LIBC32CONV).
* modules/c32toupper-tests (Makefile.am): Link test-c32toupper with
$(LIBC32CONV).
* modules/c32width (Link): Add $(LIBC32CONV).
* modules/c32width-tests (Makefile.am): Link test-c32width with
$(LIBC32CONV).
* modules/c32swidth (Link): Add $(LIBC32CONV).
* modules/c32swidth-tests (Makefile.am): Link test-c32swidth with
$(LIBC32CONV).
* modules/mbchar (Link): Add $(LIBC32CONV).
* modules/mbiter (Link): Add $(LIBC32CONV).
* modules/mbuiter (Link): Add $(LIBC32CONV).
* modules/mbfile (Link): Add $(LIBC32CONV).
* modules/mbmemcasecmp (Link): Add $(LIBC32CONV).
* modules/mbmemcasecmp-tests (Makefile.am): Link test-mbmemcasecmp with
$(LIBC32CONV).
* modules/mbscasecmp (Link): Add $(LIBC32CONV).
* modules/mbscasecmp-tests (Makefile.am): Link test-mbscasecmp with
$(LIBC32CONV).
* modules/mbscasestr (Link): Add $(LIBC32CONV).
* modules/mbscasestr-tests (Makefile.am): Link test-mbscasestr1,
test-mbscasestr2, test-mbscasestr3, test-mbscasestr4 with $(LIBC32CONV).
* modules/mbschr (Link): Add $(LIBC32CONV).
* modules/mbschr-tests (Makefile.am): Link test-mbschr with
$(LIBC32CONV).
* modules/mbscspn (Link): Add $(LIBC32CONV).
* modules/mbscspn-tests (Makefile.am): Link test-mbscspn with
$(LIBC32CONV).
* modules/mbslen (Link): Add $(LIBC32CONV).
* modules/mbsncasecmp (Link): Add $(LIBC32CONV).
* modules/mbsncasecmp-tests (Makefile.am): Link test-mbsncasecmp with
$(LIBC32CONV).
* modules/mbsnlen (Link): Add $(LIBC32CONV).
* modules/mbspbrk (Link): Add $(LIBC32CONV).
* modules/mbspbrk-tests (Makefile.am): Link test-mbspbrk with
$(LIBC32CONV).
* modules/mbspcasecmp (Link): Add $(LIBC32CONV).
* modules/mbspcasecmp-tests (Makefile.am): Link test-mbspcasecmp with
$(LIBC32CONV).
* modules/mbsrchr (Link): Add $(LIBC32CONV).
* modules/mbsrchr-tests (Makefile.am): Link test-mbsrchr with
$(LIBC32CONV).
* modules/mbssep (Link): Add $(LIBC32CONV).
* modules/mbsspn (Link): Add $(LIBC32CONV).
* modules/mbsspn-tests (Makefile.am): Link test-mbsspn with
$(LIBC32CONV).
* modules/mbsstr (Link): Add $(LIBC32CONV).
* modules/mbsstr-tests (Makefile.am): Link test-mbsstr1, test-mbsstr2,
test-mbsstr3 with $(LIBC32CONV).
* modules/mbstok_r (Link): Add $(LIBC32CONV).
* modules/propername (Link): Add $(LIBC32CONV).
* modules/regex-quote (Link): Add $(LIBC32CONV).
* modules/regex-quote-tests (Makefile.am): Link test-regex-quote with
$(LIBC32CONV).
* modules/trim (Link): Add $(LIBC32CONV).
* modules/trim-tests (Makefile.am): Link test-trim with $(LIBC32CONV).
* modules/exclude (Link): Add $(LIBC32CONV).
* modules/exclude-tests (Makefile.am): Link test-exclude with
$(LIBC32CONV).
* doc/posix-headers/uchar.texi: Mention the uchar-c23 module.
* doc/posix-functions/mbrtoc32.texi: Likewise.
* doc/strings.texi (The char32_t type): Likewise.
This commit is contained in:
Bruno Haible
2023-06-27 11:28:26 +02:00
parent 8222c4ae8c
commit c39d83dd0e
145 changed files with 1051 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
ChangeLog
View File

@@ -1,3 +1,235 @@
2023-06-27 Bruno Haible <bruno@clisp.org>
c32*: Optionally enforce ISO C 23 semantics of char32_t.
* lib/lc-charset-unicode.h: New file.
* lib/lc-charset-unicode.c: New file.
* modules/uchar-c23: New file.
* lib/uchar.in.h (char32_t): Add comment.
* lib/mbrtoc32.c: Include lc-charset-unicode.h.
(mbrtoc32): If char32_t is Unicode and wchar_t is not, invoke
locale_encoding_to_unicode.
* lib/btoc32.c: Include lc-charset-unicode.h.
(btoc32): If char32_t is Unicode and wchar_t is not, invoke
locale_encoding_to_unicode.
* lib/c32rtomb.c: Include lc-charset-unicode.h.
(c32rtomb): If char32_t is Unicode and wchar_t is not, invoke
unicode_to_locale_encoding.
* lib/c32tob.c: Include lc-charset-unicode.h.
(c32tob): If char32_t is Unicode and wchar_t is not, invoke
unicode_to_locale_encoding.
* lib/mbsnrtoc32s.c: If char32_t is Unicode and wchar_t is not, don't
use mbsnrtowcs.
* lib/mbsrtoc32s.c: If char32_t is Unicode and wchar_t is not, don't use
mbsrtowcs.
* lib/c32snrtombs.c: If char32_t is Unicode and wchar_t is not, don't
use wcsnrtombs.
* lib/c32srtombs.c: If char32_t is Unicode and wchar_t is not, don't use
wcsrtombs.
* lib/c32is-impl.h: Include lc-charset-unicode.h.
(FUNC): If char32_t is Unicode and wchar_t is not, use UCS_FUNC.
* lib/c32to-impl.h: Include lc-charset-unicode.h.
(FUNC): If char32_t is Unicode and wchar_t is not, use UCS_FUNC.
* lib/c32width.c: Include lc-charset-unicode.h.
(c32width): If char32_t is Unicode and wchar_t is not, use uc_width.
* tests/test-mbrtoc32.c: Include <wchar.h>.
(main): Skip GB18030 tests on NetBSD and Solaris. If
GL_CHAR32_T_IS_UNICODE, expect Unicode encoding for the char32_t values.
* tests/test-mbrtoc32-w32.c: Include <wchar.h>.
(test_one_locale): Simplify.
* tests/test-c32rtomb.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32rtomb.sh: Update.
* tests/test-mbsnrtoc32s.c: Include <wchar.h>.
(main): Skip GB18030 tests on NetBSD and Solaris.
* tests/test-mbsrtoc32s.c: Include <wchar.h>.
(main): Skip GB18030 tests on NetBSD and Solaris.
* tests/test-mbstoc32s.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32snrtombs.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32srtombs.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32stombs.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isalnum.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isalnum.sh: Update.
* tests/test-c32isalpha.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32isalpha.sh: Update.
* tests/test-c32isblank.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isblank.sh: Update.
* tests/test-c32iscntrl.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32iscntrl.sh: Update.
* tests/test-c32isdigit.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isdigit.sh: Update.
* tests/test-c32isgraph.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32isgraph.sh: Update.
* tests/test-c32islower.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32islower.sh: Update.
* tests/test-c32isprint.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32isprint.sh: Update.
* tests/test-c32ispunct.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32ispunct.sh: Update.
* tests/test-c32isspace.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isspace.sh: Update.
* tests/test-c32isupper.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isupper.sh: Update.
* tests/test-c32isxdigit.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32isxdigit.sh: Update.
* tests/test-c32tolower.c (main): Skip GB18030 tests on NetBSD and
Solaris.
* tests/test-c32tolower.sh: Update.
* tests/test-c32toupper.c (main): Skip GB18030 tests on NetBSD and
Solaris. Disable tests that would fail on macOS, FreeBSD, NetBSD,
Solaris.
* tests/test-c32toupper.sh: Update.
* modules/mbrtoc32 (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbrtoc32-tests (Makefile.am): Link test-mbrtoc32 with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/btoc32 (Link): New section.
* modules/btoc32-tests (Makefile.am): Link test-btoc32 with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32rtomb (Link): New section.
* modules/c32rtomb-tests (Makefile.am): Link test-c32rtomb with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32tob (Link): New section.
* modules/mbsnrtoc32s (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbsnrtoc32s-tests (Makefile.am): Link test-mbsnrtoc32s with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/mbsrtoc32s (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbsrtoc32s-tests (Makefile.am): Link test-mbsrtoc32s with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/mbstoc32s (Link): Add $(LIBUNISTRING) $(LIBC32CONV).
* modules/mbstoc32s-tests (Makefile.am): Link test-mbstoc32s with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32snrtombs (Link): New section.
* modules/c32snrtombs-tests (Makefile.am): Link test-c32snrtombs with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32srtombs (Link): New section.
* modules/c32srtombs-tests (Makefile.am): Link test-c32srtombs with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32stombs (Link): New section.
* modules/c32stombs-tests (Makefile.am): Link test-c32stombs with
$(LIBUNISTRING) $(LIBC32CONV).
* modules/c32isalnum (Link): Add $(LIBC32CONV).
* modules/c32isalnum-tests (Makefile.am): Link test-c32isalnum with
$(LIBC32CONV).
* modules/c32isalpha (Link): Add $(LIBC32CONV).
* modules/c32isalpha-tests (Makefile.am): Link test-c32isalpha with
$(LIBC32CONV).
* modules/c32isblank (Link): Add $(LIBC32CONV).
* modules/c32isblank-tests (Makefile.am): Link test-c32isblank with
$(LIBC32CONV).
* modules/c32iscntrl (Link): Add $(LIBC32CONV).
* modules/c32iscntrl-tests (Makefile.am): Link test-c32iscntrl with
$(LIBC32CONV).
* modules/c32isdigit (Link): Add $(LIBC32CONV).
* modules/c32isdigit-tests (Makefile.am): Link test-c32isdigit with
$(LIBC32CONV).
* modules/c32isgraph (Link): Add $(LIBC32CONV).
* modules/c32isgraph-tests (Makefile.am): Link test-c32isgraph with
$(LIBC32CONV).
* modules/c32islower (Link): Add $(LIBC32CONV).
* modules/c32islower-tests (Makefile.am): Link test-c32islower with
$(LIBC32CONV).
* modules/c32isprint (Link): Add $(LIBC32CONV).
* modules/c32isprint-tests (Makefile.am): Link test-c32isprint with
$(LIBC32CONV).
* modules/c32ispunct (Link): Add $(LIBC32CONV).
* modules/c32ispunct-tests (Makefile.am): Link test-c32ispunct with
$(LIBC32CONV).
* modules/c32isspace (Link): Add $(LIBC32CONV).
* modules/c32isspace-tests (Makefile.am): Link test-c32isspace with
$(LIBC32CONV).
* modules/c32isupper (Link): Add $(LIBC32CONV).
* modules/c32isupper-tests (Makefile.am): Link test-c32isupper with
$(LIBC32CONV).
* modules/c32isxdigit (Link): Add $(LIBC32CONV).
* modules/c32isxdigit-tests (Makefile.am): Link test-c32isxdigit with
$(LIBC32CONV).
* modules/c32tolower (Link): Add $(LIBC32CONV).
* modules/c32tolower-tests (Makefile.am): Link test-c32tolower with
$(LIBC32CONV).
* modules/c32toupper (Link): Add $(LIBC32CONV).
* modules/c32toupper-tests (Makefile.am): Link test-c32toupper with
$(LIBC32CONV).
* modules/c32width (Link): Add $(LIBC32CONV).
* modules/c32width-tests (Makefile.am): Link test-c32width with
$(LIBC32CONV).
* modules/c32swidth (Link): Add $(LIBC32CONV).
* modules/c32swidth-tests (Makefile.am): Link test-c32swidth with
$(LIBC32CONV).
* modules/mbchar (Link): Add $(LIBC32CONV).
* modules/mbiter (Link): Add $(LIBC32CONV).
* modules/mbuiter (Link): Add $(LIBC32CONV).
* modules/mbfile (Link): Add $(LIBC32CONV).
* modules/mbmemcasecmp (Link): Add $(LIBC32CONV).
* modules/mbmemcasecmp-tests (Makefile.am): Link test-mbmemcasecmp with
$(LIBC32CONV).
* modules/mbscasecmp (Link): Add $(LIBC32CONV).
* modules/mbscasecmp-tests (Makefile.am): Link test-mbscasecmp with
$(LIBC32CONV).
* modules/mbscasestr (Link): Add $(LIBC32CONV).
* modules/mbscasestr-tests (Makefile.am): Link test-mbscasestr1,
test-mbscasestr2, test-mbscasestr3, test-mbscasestr4 with $(LIBC32CONV).
* modules/mbschr (Link): Add $(LIBC32CONV).
* modules/mbschr-tests (Makefile.am): Link test-mbschr with
$(LIBC32CONV).
* modules/mbscspn (Link): Add $(LIBC32CONV).
* modules/mbscspn-tests (Makefile.am): Link test-mbscspn with
$(LIBC32CONV).
* modules/mbslen (Link): Add $(LIBC32CONV).
* modules/mbsncasecmp (Link): Add $(LIBC32CONV).
* modules/mbsncasecmp-tests (Makefile.am): Link test-mbsncasecmp with
$(LIBC32CONV).
* modules/mbsnlen (Link): Add $(LIBC32CONV).
* modules/mbspbrk (Link): Add $(LIBC32CONV).
* modules/mbspbrk-tests (Makefile.am): Link test-mbspbrk with
$(LIBC32CONV).
* modules/mbspcasecmp (Link): Add $(LIBC32CONV).
* modules/mbspcasecmp-tests (Makefile.am): Link test-mbspcasecmp with
$(LIBC32CONV).
* modules/mbsrchr (Link): Add $(LIBC32CONV).
* modules/mbsrchr-tests (Makefile.am): Link test-mbsrchr with
$(LIBC32CONV).
* modules/mbssep (Link): Add $(LIBC32CONV).
* modules/mbsspn (Link): Add $(LIBC32CONV).
* modules/mbsspn-tests (Makefile.am): Link test-mbsspn with
$(LIBC32CONV).
* modules/mbsstr (Link): Add $(LIBC32CONV).
* modules/mbsstr-tests (Makefile.am): Link test-mbsstr1, test-mbsstr2,
test-mbsstr3 with $(LIBC32CONV).
* modules/mbstok_r (Link): Add $(LIBC32CONV).
* modules/propername (Link): Add $(LIBC32CONV).
* modules/regex-quote (Link): Add $(LIBC32CONV).
* modules/regex-quote-tests (Makefile.am): Link test-regex-quote with
$(LIBC32CONV).
* modules/trim (Link): Add $(LIBC32CONV).
* modules/trim-tests (Makefile.am): Link test-trim with $(LIBC32CONV).
* modules/exclude (Link): Add $(LIBC32CONV).
* modules/exclude-tests (Makefile.am): Link test-exclude with
$(LIBC32CONV).
* doc/posix-headers/uchar.texi: Mention the uchar-c23 module.
* doc/posix-functions/mbrtoc32.texi: Likewise.
* doc/strings.texi (The char32_t type): Likewise.
2023-06-27 Bruno Haible <bruno@clisp.org> 2023-06-27 Bruno Haible <bruno@clisp.org>
striconveh: Fix module description. striconveh: Fix module description.

4
doc/posix-functions/mbrtoc32.texi
View File

@@ -31,3 +31,7 @@ Portability problems not fixed by Gnulib:
This function is only defined as an inline function on some platforms: This function is only defined as an inline function on some platforms:
Haiku 2020. Haiku 2020.
@end itemize @end itemize
Note: If you want the guarantee that the @code{char32_t} values returned
by this function are Unicode code points, you also need to request the
@code{uchar-c23} module.

12
doc/posix-headers/uchar.texi
View File

@@ -5,9 +5,9 @@ Defines the types @code{char16_t}, @code{char32_t} and declares the
functions @code{mbrtoc16}, @code{c16rtomb}, @code{mbrtoc32}, functions @code{mbrtoc16}, @code{c16rtomb}, @code{mbrtoc32},
@code{c32rtomb}. @code{c32rtomb}.
Gnulib module: uchar Gnulib module: uchar or uchar-c23
Portability problems fixed by Gnulib: Portability problems fixed by either Gnulib module @code{uchar} or @code{uchar-c23}:
@itemize @itemize
@item @item
This header file is missing on many non-glibc platforms: This header file is missing on many non-glibc platforms:
@@ -21,6 +21,14 @@ This file produces compilation errors in C++ mode on some platforms:
AIX 7.2 with xlclang++. AIX 7.2 with xlclang++.
@end itemize @end itemize
Portability problems fixed by Gnulib module @code{uchar-c23}:
@itemize
@item
@code{char32_t} values may not be Unicode code points.
This is the case in ISO C 11 compliant but not ISO C 23 compliant
implementations.
@end itemize
Portability problems not fixed by Gnulib: Portability problems not fixed by Gnulib:
@itemize @itemize
@end itemize @end itemize

9
doc/strings.texi
View File

@@ -703,6 +703,15 @@ values already always were 32-bit and Unicode code points.
@code{*c32*} functions are optimized so that on glibc systems they @code{*c32*} functions are optimized so that on glibc systems they
immediately redirect to the corresponding @code{*wc*} functions. immediately redirect to the corresponding @code{*wc*} functions.
Gnulib implements the ISO C 23 semantics of @code{char32_t} when you
import the @samp{uchar-c23} module. Without this module, it implements
only the ISO C 11 semantics; the effect is that on some platforms
(macOS, FreeBSD, NetBSD, Solaris) a @code{char32_t} value is the same
as a @code{wchar_t} value, not a Unicode code point. Thus, when you
want to pass @code{char32_t} values to GNU libunistring or to some Unicode
centric Gnulib functions, you need the @samp{uchar-c23} module in order
to do so without portability problems.
@node The mbchar_t type @node The mbchar_t type
@subsection The @code{mbchar_t} type @subsection The @code{mbchar_t} type

15
lib/btoc32.c
View File

@@ -25,6 +25,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
#if _GL_WCHAR_T_IS_UCS4 #if _GL_WCHAR_T_IS_UCS4
_GL_EXTERN_INLINE _GL_EXTERN_INLINE
#endif #endif
@@ -49,6 +53,15 @@ btoc32 (int c)
#else #else
/* In all known locale encodings, unibyte characters correspond only to /* In all known locale encodings, unibyte characters correspond only to
characters in the BMP. */ characters in the BMP. */
return btowc (c); wint_t wc = btowc (c);
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
if (wc != WEOF && wc != 0)
{
wc = locale_encoding_to_unicode (wc);
if (wc == 0)
return WEOF;
}
# endif
return wc;
#endif #endif
} }

8
lib/c32is-impl.h
View File

@@ -28,6 +28,10 @@
# include "streq.h" # include "streq.h"
#endif #endif
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
#include "unictype.h" #include "unictype.h"
#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t #if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t
@@ -92,6 +96,10 @@ FUNC (wint_t wc)
/* char32_t and wchar_t are equivalent. */ /* char32_t and wchar_t are equivalent. */
static_assert (sizeof (char32_t) == sizeof (wchar_t)); static_assert (sizeof (char32_t) == sizeof (wchar_t));
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
return UCS_FUNC (wc);
# else
return WCHAR_FUNC (wc); return WCHAR_FUNC (wc);
# endif
#endif #endif
} }

15
lib/c32rtomb.c
View File

@@ -28,6 +28,10 @@
#include "localcharset.h" #include "localcharset.h"
#include "streq.h" #include "streq.h"
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
size_t size_t
c32rtomb (char *s, char32_t wc, mbstate_t *ps) c32rtomb (char *s, char32_t wc, mbstate_t *ps)
#undef c32rtomb #undef c32rtomb
@@ -111,6 +115,17 @@ c32rtomb (char *s, char32_t wc, mbstate_t *ps)
#else #else
/* char32_t and wchar_t are equivalent. */ /* char32_t and wchar_t are equivalent. */
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
if (wc != 0)
{
wc = unicode_to_locale_encoding (wc);
if (wc == 0)
{
errno = EILSEQ;
return (size_t)(-1);
}
}
# endif
return wcrtomb (s, (wchar_t) wc, ps); return wcrtomb (s, (wchar_t) wc, ps);
#endif #endif

2
lib/c32snrtombs.c
View File

@@ -24,7 +24,7 @@
#include <wchar.h> #include <wchar.h>
#if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || _GL_SMALL_WCHAR_T #if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || (GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION) || _GL_SMALL_WCHAR_T
/* The char32_t encoding of a multibyte character may be different than its /* The char32_t encoding of a multibyte character may be different than its
wchar_t encoding, or char32_t is wider than wchar_t. */ wchar_t encoding, or char32_t is wider than wchar_t. */

2
lib/c32srtombs.c
View File

@@ -24,7 +24,7 @@
#include <wchar.h> #include <wchar.h>
#if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || _GL_SMALL_WCHAR_T #if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || (GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION) || _GL_SMALL_WCHAR_T
/* The char32_t encoding of a multibyte character may be different than its /* The char32_t encoding of a multibyte character may be different than its
wchar_t encoding, or char32_t is wider than wchar_t. */ wchar_t encoding, or char32_t is wider than wchar_t. */

8
lib/c32to-impl.h
View File

@@ -24,6 +24,10 @@
# include "streq.h" # include "streq.h"
#endif #endif
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
#include "unicase.h" #include "unicase.h"
#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t #if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t
@@ -79,6 +83,10 @@ FUNC (wint_t wc)
/* char32_t and wchar_t are equivalent. */ /* char32_t and wchar_t are equivalent. */
static_assert (sizeof (char32_t) == sizeof (wchar_t)); static_assert (sizeof (char32_t) == sizeof (wchar_t));
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
return UCS_FUNC (wc);
# else
return WCHAR_FUNC (wc); return WCHAR_FUNC (wc);
# endif
#endif #endif
} }

12
lib/c32tob.c
View File

@@ -26,6 +26,10 @@
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
#if _GL_WCHAR_T_IS_UCS4 #if _GL_WCHAR_T_IS_UCS4
_GL_EXTERN_INLINE _GL_EXTERN_INLINE
#endif #endif
@@ -53,6 +57,14 @@ c32tob (wint_t wc)
else else
return EOF; return EOF;
#else #else
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
if (wc != 0)
{
wc = unicode_to_locale_encoding (wc);
if (wc == 0)
return EOF;
}
# endif
return wctob (wc); return wctob (wc);
#endif #endif
} }

8
lib/c32width.c
View File

@@ -33,6 +33,11 @@
#endif #endif
#include "localcharset.h" #include "localcharset.h"
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
#include "uniwidth.h" #include "uniwidth.h"
#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t #if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t
@@ -89,6 +94,9 @@ c32width (char32_t wc)
/* char32_t and wchar_t are equivalent. */ /* char32_t and wchar_t are equivalent. */
static_assert (sizeof (char32_t) == sizeof (wchar_t)); static_assert (sizeof (char32_t) == sizeof (wchar_t));
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
return uc_width (wc, locale_charset ());
# endif
return wcwidth (wc); return wcwidth (wc);
#endif #endif
} }

266
lib/lc-charset-unicode.c Normal file
View File

@@ -0,0 +1,266 @@
/* Conversion between the current locale's character encoding and Unicode.
Copyright (C) 2023 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2023. */
#include <config.h>
/* Specification. */
#include "lc-charset-unicode.h"
#if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
/* We use iconv() to convert between a 'wchar_t' value and a Unicode code point.
For performance reasons, we don't allocate an iconv_t for each conversion,
but instead cache it for subsequent conversions. Since an iconv_t descriptor
can only be used in a single thread at a time, this cache must be
per-thread. */
# include <iconv.h>
# include <stdlib.h>
# include <string.h>
# include <wchar.h>
# include "localcharset.h"
# include "streq.h"
# include "glthread/lock.h"
# include "glthread/tls.h"
# include "unistr.h"
/* Maximum length of encoding. Attained for "ISO-8859-15". */
# define MAX_ENCODING_LEN 11
struct converters
{
iconv_t cd_locale_to_utf8;
iconv_t cd_utf8_to_locale;
/* NUL-terminated encoding name. */
char encoding[MAX_ENCODING_LEN + 1];
};
static gl_tls_key_t converters_key; /* TLS key for a 'struct converters *' */
/* Frees a 'struct converters *', for example when a thread terminates. */
static void
free_converters (void *p)
{
if (p != NULL)
{
struct converters *conv = p;
iconv_close (conv->cd_locale_to_utf8);
iconv_close (conv->cd_utf8_to_locale);
free (conv);
}
}
static void
key_init (void)
{
gl_tls_key_init (converters_key, free_converters);
/* The per-thread initial value is NULL. */
}
/* Ensure that key_init is called once only. */
gl_once_define(static, key_init_once)
/* Returns the per-thread 'struct converters *' that contains converters for the
given encoding. Returns NULL upon failure. */
static struct converters *
get_converters (const char *encoding)
{
if (strlen (encoding) > MAX_ENCODING_LEN)
/* If this happens, increase MAX_ENCODING_LEN. */
return NULL;
gl_once (key_init_once, key_init);
struct converters *conv = gl_tls_get (converters_key);
if (conv == NULL)
{
conv = (struct converters *) malloc (sizeof (struct converters));
if (conv == NULL)
/* Out of memory. */
return NULL;
conv->cd_locale_to_utf8 = iconv_open ("UTF-8", encoding);
conv->cd_utf8_to_locale = iconv_open (encoding, "UTF-8");
if (conv->cd_locale_to_utf8 == (iconv_t)(-1)
|| conv->cd_utf8_to_locale == (iconv_t)(-1))
{
/* iconv does not support this encoding. */
if (conv->cd_locale_to_utf8 != (iconv_t)(-1))
iconv_close (conv->cd_locale_to_utf8);
if (conv->cd_utf8_to_locale != (iconv_t)(-1))
iconv_close (conv->cd_utf8_to_locale);
free (conv);
return NULL;
}
strcpy (conv->encoding, encoding);
}
else if (strcmp (conv->encoding, encoding) != 0)
{
/* The locale encoding of this thread changed. */
iconv_t new_cd_locale_to_utf8 = iconv_open ("UTF-8", encoding);
iconv_t new_cd_utf8_to_locale = iconv_open (encoding, "UTF-8");
if (new_cd_locale_to_utf8 == (iconv_t)(-1)
|| new_cd_utf8_to_locale == (iconv_t)(-1))
{
/* iconv does not support this encoding. */
if (new_cd_locale_to_utf8 != (iconv_t)(-1))
iconv_close (new_cd_locale_to_utf8);
if (new_cd_utf8_to_locale != (iconv_t)(-1))
iconv_close (new_cd_utf8_to_locale);
return NULL;
}
iconv_close (conv->cd_locale_to_utf8);
iconv_close (conv->cd_utf8_to_locale);
conv->cd_locale_to_utf8 = new_cd_locale_to_utf8;
conv->cd_utf8_to_locale = new_cd_utf8_to_locale;
strcpy (conv->encoding, encoding);
}
return conv;
}
char32_t
locale_encoding_to_unicode (wchar_t wc)
{
/* This function is like a simplified variant of u32_conv_from_encoding,
that uses a cached per-thread iconv_t instead of allocating an iconv_t
at each call. */
if (wc == 0)
/* Invalid argument. */
abort ();
const char *encoding = locale_charset ();
if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
/* Assume that if the locale encoding is UTF-8, the wchar_t encoding is
Unicode. */
return wc;
if (STREQ_OPT (encoding, "ASCII", 'A', 'S', 'C', 'I', 'I', 0, 0, 0, 0))
/* In the POSIX locale, avoid conversion errors. */
return wc;
struct converters *conv = get_converters (encoding);
if (conv == NULL)
return 0;
char mbbuf[64];
size_t mbcnt;
{
mbstate_t state = { 0 };
mbcnt = wcrtomb (mbbuf, wc, &state);
if (mbcnt > sizeof (mbbuf))
/* wcrtomb did not recognize the wide character wc. */
abort ();
}
char utf8buf[6];
size_t utf8cnt;
{
char *mbptr = mbbuf;
size_t mbsize = mbcnt;
char *utf8ptr = utf8buf;
size_t utf8size = sizeof (utf8buf);
size_t ret = iconv (conv->cd_locale_to_utf8,
&mbptr, &mbsize,
&utf8ptr, &utf8size);
if (ret == (size_t)(-1))
/* Conversion error. */
return 0;
if (mbsize != 0)
/* The input was not entirely converted. */
return 0;
utf8cnt = sizeof (utf8buf) - utf8size; /* = utf8ptr - utf8buf */
if (utf8cnt == 0)
/* The conversion produced no output. */
return 0;
}
ucs4_t uc;
if (u8_mbtouc (&uc, (const uint8_t *) utf8buf, utf8cnt) != utf8cnt)
/* iconv produced an invalid UTF-8 byte sequence. */
abort ();
return uc;
}
wchar_t
unicode_to_locale_encoding (char32_t uc)
{
if (uc == 0)
/* Invalid argument. */
abort ();
/* This function is like a simplified variant of u32_conv_to_encoding
that uses a cached per-thread iconv_t instead of allocating an iconv_t
at each call. */
const char *encoding = locale_charset ();
if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
/* Assume that if the locale encoding is UTF-8, the wchar_t encoding is
Unicode. */
return uc;
if (STREQ_OPT (encoding, "ASCII", 'A', 'S', 'C', 'I', 'I', 0, 0, 0, 0))
/* In the POSIX locale, avoid conversion errors. */
return uc;
struct converters *conv = get_converters (encoding);
if (conv == NULL)
return 0;
char utf8buf[6];
int utf8cnt = u8_uctomb ((uint8_t *) utf8buf, uc, sizeof (utf8buf));
if (utf8cnt < 0)
/* Out-of-range Unicode character. */
return 0;
char mbbuf[64];
size_t mbcnt;
{
char *utf8ptr = utf8buf;
size_t utf8size = utf8cnt;
char *mbptr = mbbuf;
size_t mbsize = sizeof (mbbuf);
size_t ret = iconv (conv->cd_utf8_to_locale,
&utf8ptr, &utf8size,
&mbptr, &mbsize);
if (ret == (size_t)(-1))
/* Conversion error. */
return 0;
if (utf8size != 0)
/* The input was not entirely converted. */
return 0;
mbcnt = sizeof (mbbuf) - mbsize; /* = mbptr - mbbuf */
if (mbcnt == 0)
/* The conversion produced no output. */
return 0;
}
wchar_t wc;
{
mbstate_t state = { 0 };
if (mbrtowc (&wc, mbbuf, mbcnt, &state) != mbcnt)
/* iconv produced an invalid multibyte sequence. */
return 0;
}
return wc;
}
#else
/* This declaration is solely to ensure that after preprocessing
this file is never empty. */
typedef int dummy;
#endif

33
lib/lc-charset-unicode.h Normal file
View File

@@ -0,0 +1,33 @@
/* Conversion between the current locale's character encoding and Unicode.
Copyright (C) 2023 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2023. */
/* This facility is only needed on specific platforms. */
#if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
# include <wchar.h>
# include <uchar.h>
/* Returns WC (must be != 0) as a Unicode character,
or 0 in case it cannot be converted. */
extern char32_t locale_encoding_to_unicode (wchar_t wc);
/* Returns UC (must be != 0) as a wide character,
or 0 in case it cannot be converted. */
extern wchar_t unicode_to_locale_encoding (char32_t uc);
#endif

15
lib/mbrtoc32.c
View File

@@ -26,6 +26,10 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#if GL_CHAR32_T_IS_UNICODE
# include "lc-charset-unicode.h"
#endif
#if GNULIB_defined_mbstate_t /* AIX, IRIX */ #if GNULIB_defined_mbstate_t /* AIX, IRIX */
/* Implement mbrtoc32() on top of mbtowc() for the non-UTF-8 locales /* Implement mbrtoc32() on top of mbtowc() for the non-UTF-8 locales
and directly for the UTF-8 locales. */ and directly for the UTF-8 locales. */
@@ -242,6 +246,17 @@ mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps)
/* char32_t and wchar_t are equivalent. Use mbrtowc(). */ /* char32_t and wchar_t are equivalent. Use mbrtowc(). */
wchar_t wc; wchar_t wc;
size_t ret = mbrtowc (&wc, s, n, ps); size_t ret = mbrtowc (&wc, s, n, ps);
# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
if (ret < (size_t) -2 && wc != 0)
{
wc = locale_encoding_to_unicode (wc);
if (wc == 0)
{
ret = (size_t) -1;
errno = EILSEQ;
}
}
# endif
if (ret < (size_t) -2 && pwc != NULL) if (ret < (size_t) -2 && pwc != NULL)
*pwc = wc; *pwc = wc;
return ret; return ret;

2
lib/mbsnrtoc32s.c
View File

@@ -23,7 +23,7 @@
#include <wchar.h> #include <wchar.h>
#if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || _GL_SMALL_WCHAR_T #if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || (GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION) || _GL_SMALL_WCHAR_T
/* The char32_t encoding of a multibyte character may be different than its /* The char32_t encoding of a multibyte character may be different than its
wchar_t encoding, or char32_t is wider than wchar_t. */ wchar_t encoding, or char32_t is wider than wchar_t. */

2
lib/mbsrtoc32s.c
View File

@@ -23,7 +23,7 @@
#include <wchar.h> #include <wchar.h>
#if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || _GL_SMALL_WCHAR_T #if (HAVE_WORKING_MBRTOC32 && !_GL_WCHAR_T_IS_UCS4) || (GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION) || _GL_SMALL_WCHAR_T
/* The char32_t encoding of a multibyte character may be different than its /* The char32_t encoding of a multibyte character may be different than its
wchar_t encoding, or char32_t is wider than wchar_t. */ wchar_t encoding, or char32_t is wider than wchar_t. */

4
lib/uchar.in.h
View File

@@ -110,7 +110,9 @@ typedef uint_least16_t gl_char16_t;
/* A 32-bit variant of wchar_t. /* A 32-bit variant of wchar_t.
Note: This type is only mandated by ISO C 11 or newer. In ISO C 23 Note: This type is only mandated by ISO C 11 or newer. In ISO C 23
and newer, it denotes UTF-32 code points; in older versions of ISO C and newer, it denotes UTF-32 code points; in older versions of ISO C
it did so only on platforms on which __STDC_UTF_32__ was defined. */ it did so only on platforms on which __STDC_UTF_32__ was defined.
In gnulib, we guarantee that it denotes UTF-32 code points if and
only if the module 'uchar-c23' is in use. */
typedef uint_least32_t char32_t; typedef uint_least32_t char32_t;
#elif @GNULIBHEADERS_OVERRIDE_CHAR32_T@ #elif @GNULIBHEADERS_OVERRIDE_CHAR32_T@

4
modules/btoc32
View File

@@ -18,6 +18,10 @@ lib_SOURCES += btoc32.c
Include: Include:
<uchar.h> <uchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/btoc32-tests
View File

@@ -19,4 +19,4 @@ Makefile.am:
TESTS += test-btoc32-1.sh test-btoc32-2.sh test-btoc32-3.sh TESTS += test-btoc32-1.sh test-btoc32-2.sh test-btoc32-3.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-btoc32 check_PROGRAMS += test-btoc32
test_btoc32_LDADD = $(LDADD) $(SETLOCALE_LIB) test_btoc32_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(LIBC32CONV)

1
modules/c32isalnum
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isalnum-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isalnum check_PROGRAMS += test-c32isalnum
test_c32isalnum_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isalnum_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isalpha
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isalpha-tests
View File

@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isalpha check_PROGRAMS += test-c32isalpha
test_c32isalpha_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isalpha_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isblank
View File

@@ -37,6 +37,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isblank-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isblank check_PROGRAMS += test-c32isblank
test_c32isblank_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isblank_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32iscntrl
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32iscntrl-tests
View File

@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32iscntrl check_PROGRAMS += test-c32iscntrl
test_c32iscntrl_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32iscntrl_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isdigit
View File

@@ -37,6 +37,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isdigit-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isdigit check_PROGRAMS += test-c32isdigit
test_c32isdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isgraph
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isgraph-tests
View File

@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isgraph check_PROGRAMS += test-c32isgraph
test_c32isgraph_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isgraph_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32islower
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32islower-tests
View File

@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32islower check_PROGRAMS += test-c32islower
test_c32islower_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32islower_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isprint
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isprint-tests
View File

@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isprint check_PROGRAMS += test-c32isprint
test_c32isprint_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isprint_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32ispunct
View File

@@ -37,6 +37,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32ispunct-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32ispunct check_PROGRAMS += test-c32ispunct
test_c32ispunct_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32ispunct_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isspace
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isspace-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isspace check_PROGRAMS += test-c32isspace
test_c32isspace_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isspace_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isupper
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isupper-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isupper check_PROGRAMS += test-c32isupper
test_c32isupper_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isupper_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32isxdigit
View File

@@ -38,6 +38,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32isxdigit-tests
View File

@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isxdigit check_PROGRAMS += test-c32isxdigit
test_c32isxdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32isxdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

4
modules/c32rtomb
View File

@@ -31,6 +31,10 @@ endif
Include: Include:
<uchar.h> <uchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32rtomb-tests
View File

@@ -40,4 +40,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32rtomb test-c32rtomb-w32 check_PROGRAMS += test-c32rtomb test-c32rtomb-w32
test_c32rtomb_LDADD = $(LDADD) $(SETLOCALE_LIB) test_c32rtomb_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(LIBC32CONV)

4
modules/c32snrtombs
View File

@@ -24,6 +24,10 @@ lib_SOURCES += c32snrtombs.c
Include: Include:
<uchar.h> <uchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/c32snrtombs-tests
View File

@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32snrtombs check_PROGRAMS += test-c32snrtombs
test_c32snrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB) test_c32snrtombs_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(LIBC32CONV)

4
modules/c32srtombs
View File

@@ -24,6 +24,10 @@ lib_SOURCES += c32srtombs.c
Include: Include:
<uchar.h> <uchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/c32srtombs-tests
View File

@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32srtombs check_PROGRAMS += test-c32srtombs
test_c32srtombs_LDADD = $(LDADD) $(SETLOCALE_LIB) test_c32srtombs_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(LIBC32CONV)

4
modules/c32stombs
View File

@@ -18,6 +18,10 @@ lib_SOURCES += c32stombs.c
Include: Include:
<uchar.h> <uchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/c32stombs-tests
View File

@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32stombs check_PROGRAMS += test-c32stombs
test_c32stombs_LDADD = $(LDADD) $(SETLOCALE_LIB) test_c32stombs_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(LIBC32CONV)

1
modules/c32swidth
View File

@@ -28,6 +28,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32swidth-tests
View File

@@ -12,4 +12,4 @@ configure.ac:
Makefile.am: Makefile.am:
TESTS += test-c32swidth TESTS += test-c32swidth
check_PROGRAMS += test-c32swidth check_PROGRAMS += test-c32swidth
test_c32swidth_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) test_c32swidth_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) $(LIBC32CONV)

4
modules/c32tob
View File

@@ -23,6 +23,10 @@ lib_SOURCES += c32tob.c
Include: Include:
<uchar.h> <uchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

1
modules/c32tolower
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32tolower-tests
View File

@@ -27,4 +27,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32tolower check_PROGRAMS += test-c32tolower
test_c32tolower_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32tolower_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32toupper
View File

@@ -36,6 +36,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32toupper-tests
View File

@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32toupper check_PROGRAMS += test-c32toupper
test_c32toupper_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) test_c32toupper_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/c32width
View File

@@ -33,6 +33,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/c32width-tests
View File

@@ -13,4 +13,4 @@ configure.ac:
Makefile.am: Makefile.am:
TESTS += test-c32width TESTS += test-c32width
check_PROGRAMS += test-c32width check_PROGRAMS += test-c32width
test_c32width_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) test_c32width_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) $(LIBC32CONV)

1
modules/exclude
View File

@@ -30,6 +30,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
GPL GPL

2
modules/exclude-tests
View File

@@ -26,4 +26,4 @@ TESTS += \
test-exclude8.sh test-exclude8.sh
check_PROGRAMS += test-exclude check_PROGRAMS += test-exclude
test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBTHREAD) test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBTHREAD) $(LIBC32CONV)

1
modules/mbchar
View File

@@ -38,6 +38,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

1
modules/mbfile
View File

@@ -27,6 +27,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

1
modules/mbiter
View File

@@ -27,6 +27,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

1
modules/mbmemcasecmp
View File

@@ -19,6 +19,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbmemcasecmp-tests
View File

@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbmemcasecmp check_PROGRAMS += test-mbmemcasecmp
test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

2
modules/mbrtoc32
View File

@@ -52,7 +52,9 @@ Include:
<uchar.h> <uchar.h>
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/mbrtoc32-tests
View File

@@ -46,4 +46,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbrtoc32 test-mbrtoc32-w32 check_PROGRAMS += test-mbrtoc32 test-mbrtoc32-w32
test_mbrtoc32_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbrtoc32_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbscasecmp
View File

@@ -20,6 +20,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbscasecmp-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscasecmp.sh TESTS += test-mbscasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbscasecmp check_PROGRAMS += test-mbscasecmp
test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbscasestr
View File

@@ -26,6 +26,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

8
modules/mbscasestr-tests
View File

@@ -24,7 +24,7 @@ Makefile.am:
TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4 check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV)
test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbschr
View File

@@ -20,6 +20,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbschr-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbschr.sh TESTS += test-mbschr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@' TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbschr check_PROGRAMS += test-mbschr
test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbscspn
View File

@@ -22,6 +22,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbscspn-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscspn.sh TESTS += test-mbscspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbscspn check_PROGRAMS += test-mbscspn
test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbslen
View File

@@ -22,6 +22,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

1
modules/mbsncasecmp
View File

@@ -20,6 +20,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbsncasecmp-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsncasecmp.sh TESTS += test-mbsncasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbsncasecmp check_PROGRAMS += test-mbsncasecmp
test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbsnlen
View File

@@ -20,6 +20,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/mbsnrtoc32s
View File

@@ -27,7 +27,9 @@ Include:
<uchar.h> <uchar.h>
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbsnrtoc32s-tests
View File

@@ -35,4 +35,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsnrtoc32s check_PROGRAMS += test-mbsnrtoc32s
test_mbsnrtoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsnrtoc32s_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbspbrk
View File

@@ -22,6 +22,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbspbrk-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspbrk.sh TESTS += test-mbspbrk.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbspbrk check_PROGRAMS += test-mbspbrk
test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbspcasecmp
View File

@@ -20,6 +20,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbspcasecmp-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspcasecmp.sh TESTS += test-mbspcasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbspcasecmp check_PROGRAMS += test-mbspcasecmp
test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbsrchr
View File

@@ -20,6 +20,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbsrchr-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsrchr.sh TESTS += test-mbsrchr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@' TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrchr check_PROGRAMS += test-mbsrchr
test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

2
modules/mbsrtoc32s
View File

@@ -26,7 +26,9 @@ Include:
<uchar.h> <uchar.h>
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/mbsrtoc32s-tests
View File

@@ -35,4 +35,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrtoc32s check_PROGRAMS += test-mbsrtoc32s
test_mbsrtoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsrtoc32s_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbssep
View File

@@ -22,6 +22,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

1
modules/mbsspn
View File

@@ -21,6 +21,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

2
modules/mbsspn-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsspn.sh TESTS += test-mbsspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsspn check_PROGRAMS += test-mbsspn
test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbsstr
View File

@@ -25,6 +25,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

6
modules/mbsstr-tests
View File

@@ -20,6 +20,6 @@ Makefile.am:
TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3 check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV)
test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

2
modules/mbstoc32s
View File

@@ -19,7 +19,9 @@ Include:
<uchar.h> <uchar.h>
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPLv2+ LGPLv2+

2
modules/mbstoc32s-tests
View File

@@ -33,4 +33,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \ LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbstoc32s check_PROGRAMS += test-mbstoc32s
test_mbstoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) test_mbstoc32s_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)

1
modules/mbstok_r
View File

@@ -23,6 +23,7 @@ Include:
Link: Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(MBRTOWC_LIB) $(MBRTOWC_LIB)
$(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
License: License:
LGPL LGPL

Some files were not shown because too many files have changed in this diff Show More