From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id F1B6D3857C71; Wed, 13 Jul 2022 08:19:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1B6D3857C71 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Define _REENT_EMERGENCY(ptr) only once X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: a3fe1ed573dddcfd905183e6b5fa60bd7cfa661d X-Git-Newrev: d0d78e96ebf4187fb9362465f1a397680447046f Message-Id: <20220713081912.F1B6D3857C71@sourceware.org> Date: Wed, 13 Jul 2022 08:19:12 +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, 13 Jul 2022 08:19:13 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd0d78e96ebf= 4187fb9362465f1a397680447046f commit d0d78e96ebf4187fb9362465f1a397680447046f Author: Matt Joyce Date: Mon May 16 10:54:31 2022 +0200 Define _REENT_EMERGENCY(ptr) only once =20 Use this macro to access the _emergency member of struct _reent. This = macro will help to replace the _emergency member of struct _reent with a thre= ad-local storage object in a follow up patch. Diff: --- newlib/libc/include/sys/reent.h | 4 ++-- newlib/libc/reent/reent.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index e9bded6c7..2b0ff46b7 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -531,7 +531,6 @@ struct _reent #define _REENT_MP_FREELIST(ptr) ((ptr)->_mp->_freelist) #define _REENT_ASCTIME_BUF(ptr) ((ptr)->_asctime_buf) #define _REENT_TM(ptr) ((ptr)->_localtime_buf) -#define _REENT_EMERGENCY(ptr) ((ptr)->_emergency) #define _REENT_STRTOK_LAST(ptr) ((ptr)->_misc->_strtok_last) #define _REENT_MBLEN_STATE(ptr) ((ptr)->_misc->_mblen_state) #define _REENT_MBTOWC_STATE(ptr)((ptr)->_misc->_mbtowc_state) @@ -704,7 +703,6 @@ struct _reent #define _REENT_MP_FREELIST(ptr) ((ptr)->_freelist) #define _REENT_ASCTIME_BUF(ptr) ((ptr)->_new._reent._asctime_buf) #define _REENT_TM(ptr) (&(ptr)->_new._reent._localtime_buf) -#define _REENT_EMERGENCY(ptr) ((ptr)->_emergency) #define _REENT_STRTOK_LAST(ptr) ((ptr)->_new._reent._strtok_last) #define _REENT_MBLEN_STATE(ptr) ((ptr)->_new._reent._mblen_state) #define _REENT_MBTOWC_STATE(ptr)((ptr)->_new._reent._mbtowc_state) @@ -720,6 +718,8 @@ struct _reent =20 #endif /* !_REENT_SMALL */ =20 +#define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency) + #define _REENT_INIT_PTR(var) \ { memset((var), 0, sizeof(*(var))); \ _REENT_INIT_PTR_ZEROED(var); \ diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c index d61415901..a9d44b455 100644 --- a/newlib/libc/reent/reent.c +++ b/newlib/libc/reent/reent.c @@ -62,8 +62,8 @@ _reclaim_reent (struct _reent *ptr) #endif =20 #ifdef _REENT_SMALL - if (ptr->_emergency) - _free_r (ptr, ptr->_emergency); + if (_REENT_EMERGENCY(ptr)) + _free_r (ptr, _REENT_EMERGENCY(ptr)); if (ptr->_mp) _free_r (ptr, ptr->_mp); if (ptr->_r48)