From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 6C2DD3856243; Tue, 15 Aug 2023 20:35:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C2DD3856243 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692131744; bh=+TMOWL8OtnnKYHyBewSTETj851qRDKmnpL+YzXrORIQ=; h=From:To:Subject:Date:From; b=EcgfEtEnVNBUQF9DlW3LVQthF4lvxxny1pDyFvesq2O7J975/bSp4pODw1WkPclmd caAKnrD2pxszHWfaAgPnZcThPv8FXEylJZqcrp9ANEbKVHqLTXDoPqBcmKl6SYP/bd WPN1hhHUbCoSWKDxHqy66mvD8SVAZvcanB2B3XzM= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin/main] struct _reent: add state for unicode functions X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 1a646ad7970a2cd3a1c931af4217cc17fc576116 X-Git-Newrev: b5111e46424b693e04bc0e964a01f871a71c26ef Message-Id: <20230815203544.6C2DD3856243@sourceware.org> Date: Tue, 15 Aug 2023 20:35:44 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db5111e46424= b693e04bc0e964a01f871a71c26ef commit b5111e46424b693e04bc0e964a01f871a71c26ef Author: Corinna Vinschen AuthorDate: Tue Aug 15 22:30:59 2023 +0200 Commit: Corinna Vinschen CommitDate: Tue Aug 15 22:30:59 2023 +0200 struct _reent: add state for unicode functions =20 C23 requires that the unicode functions c16rtomb, c8rtomb, mbrtoc16, mbrtoc32 and mbrtoc8 use their own internal state object. c32rtomb only needs an internal state if the lib supports encoding with shift states, but that's the case for newlib and Cygwin. =20 Only Cygwin implements these functions so add the states objects only for Cygwin for now. =20 Signed-off-by: Corinna Vinschen Diff: --- newlib/libc/include/sys/reent.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index c71f75dbc28c..a6c923f1cf15 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -622,6 +622,14 @@ struct _reent _mbstate_t _wcrtomb_state; _mbstate_t _wcsrtombs_state; int _h_errno; +#ifdef __CYGWIN__ + _mbstate_t _c8rtomb_state; + _mbstate_t _c16rtomb_state; + _mbstate_t _c32rtomb_state; + _mbstate_t _mbrtoc8_state; + _mbstate_t _mbrtoc16_state; + _mbstate_t _mbrtoc32_state; +#endif } _reent; #ifdef _REENT_BACKWARD_BINARY_COMPAT struct @@ -730,6 +738,14 @@ struct _reent #define _REENT_MBSRTOWCS_STATE(ptr)((ptr)->_new._reent._mbsrtowcs_state) #define _REENT_WCRTOMB_STATE(ptr)((ptr)->_new._reent._wcrtomb_state) #define _REENT_WCSRTOMBS_STATE(ptr)((ptr)->_new._reent._wcsrtombs_state) +#ifdef __CYGWIN__ +# define _REENT_C8RTOMB_STATE(ptr)((ptr)->_new._reent._c8rtomb_state) +# define _REENT_C16RTOMB_STATE(ptr)((ptr)->_new._reent._c16rtomb_state) +# define _REENT_C32RTOMB_STATE(ptr)((ptr)->_new._reent._c32rtomb_state) +# define _REENT_MBRTOC8_STATE(ptr)((ptr)->_new._reent._mbrtoc8_state) +# define _REENT_MBRTOC16_STATE(ptr)((ptr)->_new._reent._mbrtoc16_state) +# define _REENT_MBRTOC32_STATE(ptr)((ptr)->_new._reent._mbrtoc32_state) +#endif #define _REENT_L64A_BUF(ptr) ((ptr)->_new._reent._l64a_buf) #define _REENT_SIGNAL_BUF(ptr) ((ptr)->_new._reent._signal_buf) #define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_new._reent._getdate_err))