From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2134) id D22483888C7D; Wed, 30 Mar 2022 20:01:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D22483888C7D Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jeff Johnston To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Commit patch from Tobias Burnus X-Act-Checkin: newlib-cygwin X-Git-Author: Jeff Johnston X-Git-Refname: refs/heads/master X-Git-Oldrev: 49a00a0673e7318f7f27719ab2f0ac8eb3c6b439 X-Git-Newrev: 0239bc706a32364edc95ea06f667f4b233f74b77 Message-Id: <20220330200141.D22483888C7D@sourceware.org> Date: Wed, 30 Mar 2022 20:01:41 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2022 20:01:41 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D0239bc706a3= 2364edc95ea06f667f4b233f74b77 commit 0239bc706a32364edc95ea06f667f4b233f74b77 Author: Jeff Johnston Date: Wed Mar 30 15:58:06 2022 -0400 Commit patch from Tobias Burnus =20 [PATCH] newlib: Only call _fputwc_r if ELIX_LEVEL >=3D 4 =20 (nano-)vfprintf.c is enabled for ELIX_LEVEL >=3D 1. When _WIDE_ORIENT is set, its __sprint_r / __sfputs_r functions unconditionally called _fputwc_r which is only in ELEX_LEVEL >=3D 4. With this commit, the _WIDE support in (nano-)vfprintf.c is disabled for ELEX_LEVEL < 4. Diff: --- newlib/libc/stdio/nano-vfprintf.c | 4 ++-- newlib/libc/stdio/vfprintf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfp= rintf.c index bc7ed0743..838804eb9 100644 --- a/newlib/libc/stdio/nano-vfprintf.c +++ b/newlib/libc/stdio/nano-vfprintf.c @@ -356,7 +356,7 @@ __sprint_r (struct _reent *ptr, uio->uio_iovcnt =3D 0; return 0; } -#ifdef _WIDE_ORIENT +#if defined _WIDE_ORIENT && (!defined _ELIX_LEVEL || _ELIX_LEVEL >=3D 4) if (fp->_flags2 & __SWID) { struct __siov *iov; @@ -407,7 +407,7 @@ __sfputs_r (struct _reent *ptr, { register int i; =20 -#ifdef _WIDE_ORIENT +#if defined _WIDE_ORIENT && (!defined _ELIX_LEVEL || _ELIX_LEVEL >=3D 4) if (fp->_flags2 & __SWID) { wchar_t *p; diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index c1483c0ac..32ebb1468 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -370,7 +370,7 @@ __sfputs_r (struct _reent *ptr, { register int i; =20 -#ifdef _WIDE_ORIENT +#if defined _WIDE_ORIENT && (!defined _ELIX_LEVEL || _ELIX_LEVEL >=3D 4) if (fp->_flags2 & __SWID) { wchar_t *p; =20 @@ -406,7 +406,7 @@ __sprint_r (struct _reent *ptr, uio->uio_iovcnt =3D 0; return (0); } -#ifdef _WIDE_ORIENT +#if defined _WIDE_ORIENT && (!defined _ELIX_LEVEL || _ELIX_LEVEL >=3D 4) if (fp->_flags2 & __SWID) { struct __siov *iov; wchar_t *p;