public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Rename _NL_CTYPE_OUTDIGITSx_MB/WC to _NL_CTYPE_OUTDIGITx_MB/WC Date: Wed, 26 Jul 2023 18:02:29 +0000 (GMT) [thread overview] Message-ID: <20230726180229.7607A3858023@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=60ae342e8f22ad2d91eec7278629b9b53a2edded commit 60ae342e8f22ad2d91eec7278629b9b53a2edded Author: Corinna Vinschen <corinna@vinschen.de> AuthorDate: Wed Jul 26 19:48:34 2023 +0200 Commit: Corinna Vinschen <corinna@vinschen.de> CommitDate: Wed Jul 26 20:01:24 2023 +0200 Rename _NL_CTYPE_OUTDIGITSx_MB/WC to _NL_CTYPE_OUTDIGITx_MB/WC The extended _NL_foo names were originally designed after their GLibc counterparts. However, the OUTDIGIT macros were accidentally defined as OUTDIGITS, plural. Fix them. Fixes: d47d5b850bed ("Extend locale support to maintain wide char values of native strings") Conflicts: Context formatting changes in winsup/utils/locale.cc not backported to 3.4 branch Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- newlib/libc/include/langinfo.h | 40 ++++++++++++++++++++-------------------- winsup/cygwin/release/3.4.8 | 4 ++++ winsup/utils/locale.cc | 40 ++++++++++++++++++++-------------------- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/newlib/libc/include/langinfo.h b/newlib/libc/include/langinfo.h index fcf986cce11e..41d090d3710e 100644 --- a/newlib/libc/include/langinfo.h +++ b/newlib/libc/include/langinfo.h @@ -191,26 +191,26 @@ enum _NL_LOCALE_EXTENDED_FIRST_ENTRY, - _NL_CTYPE_OUTDIGITS0_MB, - _NL_CTYPE_OUTDIGITS1_MB, - _NL_CTYPE_OUTDIGITS2_MB, - _NL_CTYPE_OUTDIGITS3_MB, - _NL_CTYPE_OUTDIGITS4_MB, - _NL_CTYPE_OUTDIGITS5_MB, - _NL_CTYPE_OUTDIGITS6_MB, - _NL_CTYPE_OUTDIGITS7_MB, - _NL_CTYPE_OUTDIGITS8_MB, - _NL_CTYPE_OUTDIGITS9_MB, - _NL_CTYPE_OUTDIGITS0_WC, - _NL_CTYPE_OUTDIGITS1_WC, - _NL_CTYPE_OUTDIGITS2_WC, - _NL_CTYPE_OUTDIGITS3_WC, - _NL_CTYPE_OUTDIGITS4_WC, - _NL_CTYPE_OUTDIGITS5_WC, - _NL_CTYPE_OUTDIGITS6_WC, - _NL_CTYPE_OUTDIGITS7_WC, - _NL_CTYPE_OUTDIGITS8_WC, - _NL_CTYPE_OUTDIGITS9_WC, + _NL_CTYPE_OUTDIGIT0_MB, + _NL_CTYPE_OUTDIGIT1_MB, + _NL_CTYPE_OUTDIGIT2_MB, + _NL_CTYPE_OUTDIGIT3_MB, + _NL_CTYPE_OUTDIGIT4_MB, + _NL_CTYPE_OUTDIGIT5_MB, + _NL_CTYPE_OUTDIGIT6_MB, + _NL_CTYPE_OUTDIGIT7_MB, + _NL_CTYPE_OUTDIGIT8_MB, + _NL_CTYPE_OUTDIGIT9_MB, + _NL_CTYPE_OUTDIGIT0_WC, + _NL_CTYPE_OUTDIGIT1_WC, + _NL_CTYPE_OUTDIGIT2_WC, + _NL_CTYPE_OUTDIGIT3_WC, + _NL_CTYPE_OUTDIGIT4_WC, + _NL_CTYPE_OUTDIGIT5_WC, + _NL_CTYPE_OUTDIGIT6_WC, + _NL_CTYPE_OUTDIGIT7_WC, + _NL_CTYPE_OUTDIGIT8_WC, + _NL_CTYPE_OUTDIGIT9_WC, _NL_TIME_CODESET, _NL_TIME_WMON_1, diff --git a/winsup/cygwin/release/3.4.8 b/winsup/cygwin/release/3.4.8 index 595b584cdf39..d37272eef8bd 100644 --- a/winsup/cygwin/release/3.4.8 +++ b/winsup/cygwin/release/3.4.8 @@ -10,3 +10,7 @@ Bug Fixes - Fix AT_EMPTY_PATH handling in fchmodat and fstatat if dirfd referres to a file other than a directory Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q2/012306.html + +- Rename internal macros _NL_CTYPE_OUTDIGITSx_MB/WC to GLibc compatible + _NL_CTYPE_OUTDIGITx_MB/WC. + Addresses: https://cygwin.com/pipermail/cygwin-developers/2023-July/012637.html diff --git a/winsup/utils/locale.cc b/winsup/utils/locale.cc index 3f7e5dcca6a0..d3655169dd9b 100644 --- a/winsup/utils/locale.cc +++ b/winsup/utils/locale.cc @@ -546,26 +546,26 @@ lc_names_t lc_ctype_names[] = { { "ctype-class-names", is_string_fake, 0, 0 }, { "ctype-map-names", is_string_fake, 2, 0 }, - { "ctype-outdigit0_mb", is_string, _NL_CTYPE_OUTDIGITS0_MB, 0 }, - { "ctype-outdigit1_mb", is_string, _NL_CTYPE_OUTDIGITS1_MB, 0 }, - { "ctype-outdigit2_mb", is_string, _NL_CTYPE_OUTDIGITS2_MB, 0 }, - { "ctype-outdigit3_mb", is_string, _NL_CTYPE_OUTDIGITS3_MB, 0 }, - { "ctype-outdigit4_mb", is_string, _NL_CTYPE_OUTDIGITS4_MB, 0 }, - { "ctype-outdigit5_mb", is_string, _NL_CTYPE_OUTDIGITS5_MB, 0 }, - { "ctype-outdigit6_mb", is_string, _NL_CTYPE_OUTDIGITS6_MB, 0 }, - { "ctype-outdigit7_mb", is_string, _NL_CTYPE_OUTDIGITS7_MB, 0 }, - { "ctype-outdigit8_mb", is_string, _NL_CTYPE_OUTDIGITS8_MB, 0 }, - { "ctype-outdigit9_mb", is_string, _NL_CTYPE_OUTDIGITS9_MB, 0 }, - { "ctype-outdigit0_wc", is_wchar, _NL_CTYPE_OUTDIGITS0_WC, 0 }, - { "ctype-outdigit1_wc", is_wchar, _NL_CTYPE_OUTDIGITS1_WC, 0 }, - { "ctype-outdigit2_wc", is_wchar, _NL_CTYPE_OUTDIGITS2_WC, 0 }, - { "ctype-outdigit3_wc", is_wchar, _NL_CTYPE_OUTDIGITS3_WC, 0 }, - { "ctype-outdigit4_wc", is_wchar, _NL_CTYPE_OUTDIGITS4_WC, 0 }, - { "ctype-outdigit5_wc", is_wchar, _NL_CTYPE_OUTDIGITS5_WC, 0 }, - { "ctype-outdigit6_wc", is_wchar, _NL_CTYPE_OUTDIGITS6_WC, 0 }, - { "ctype-outdigit7_wc", is_wchar, _NL_CTYPE_OUTDIGITS7_WC, 0 }, - { "ctype-outdigit8_wc", is_wchar, _NL_CTYPE_OUTDIGITS8_WC, 0 }, - { "ctype-outdigit9_wc", is_wchar, _NL_CTYPE_OUTDIGITS9_WC, 0 }, + { "ctype-outdigit0_mb", is_string, _NL_CTYPE_OUTDIGIT0_MB, 0 }, + { "ctype-outdigit1_mb", is_string, _NL_CTYPE_OUTDIGIT1_MB, 0 }, + { "ctype-outdigit2_mb", is_string, _NL_CTYPE_OUTDIGIT2_MB, 0 }, + { "ctype-outdigit3_mb", is_string, _NL_CTYPE_OUTDIGIT3_MB, 0 }, + { "ctype-outdigit4_mb", is_string, _NL_CTYPE_OUTDIGIT4_MB, 0 }, + { "ctype-outdigit5_mb", is_string, _NL_CTYPE_OUTDIGIT5_MB, 0 }, + { "ctype-outdigit6_mb", is_string, _NL_CTYPE_OUTDIGIT6_MB, 0 }, + { "ctype-outdigit7_mb", is_string, _NL_CTYPE_OUTDIGIT7_MB, 0 }, + { "ctype-outdigit8_mb", is_string, _NL_CTYPE_OUTDIGIT8_MB, 0 }, + { "ctype-outdigit9_mb", is_string, _NL_CTYPE_OUTDIGIT9_MB, 0 }, + { "ctype-outdigit0_wc", is_wchar, _NL_CTYPE_OUTDIGIT0_WC, 0 }, + { "ctype-outdigit1_wc", is_wchar, _NL_CTYPE_OUTDIGIT1_WC, 0 }, + { "ctype-outdigit2_wc", is_wchar, _NL_CTYPE_OUTDIGIT2_WC, 0 }, + { "ctype-outdigit3_wc", is_wchar, _NL_CTYPE_OUTDIGIT3_WC, 0 }, + { "ctype-outdigit4_wc", is_wchar, _NL_CTYPE_OUTDIGIT4_WC, 0 }, + { "ctype-outdigit5_wc", is_wchar, _NL_CTYPE_OUTDIGIT5_WC, 0 }, + { "ctype-outdigit6_wc", is_wchar, _NL_CTYPE_OUTDIGIT6_WC, 0 }, + { "ctype-outdigit7_wc", is_wchar, _NL_CTYPE_OUTDIGIT7_WC, 0 }, + { "ctype-outdigit8_wc", is_wchar, _NL_CTYPE_OUTDIGIT8_WC, 0 }, + { "ctype-outdigit9_wc", is_wchar, _NL_CTYPE_OUTDIGIT9_WC, 0 }, { "charmap", is_string, CODESET, 0 }, { "ctype-mb-cur-max", is_int, _NL_CTYPE_MB_CUR_MAX, 0 }, { NULL, is_end, 0, 0 }
reply other threads:[~2023-07-26 18:02 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230726180229.7607A3858023@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).