From 9035e406cbda2dcab02dde1c6bd7db0a6f6f1563 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 May 2022 14:56:24 +0200 Subject: [PATCH] Optional struct _reent::_new::_unused Rename struct _reent::_new::_unused members _nextf and _nmalloc to _reserved_3 and _reserved_4, respectively. Rename struct _reent::_new member _unused to _reserved_5. Provide them only if _REENT_BACKWARD_BINARY_COMPAT is defined. Remove unused _N_LISTS define. --- newlib/libc/include/sys/reent.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h index 6d6796ed3..b99cfe099 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -685,15 +685,13 @@ struct _reent _mbstate_t _wcsrtombs_state; int _h_errno; } _reent; - /* Two next two fields were once used by malloc. They are no longer - used. They are used to preserve the space used before so as to - allow addition of new reent fields and keep binary compatibility. */ +#ifdef _REENT_BACKWARD_BINARY_COMPAT struct { -#define _N_LISTS 30 - unsigned char * _nextf[_N_LISTS]; - unsigned int _nmalloc[_N_LISTS]; - } _unused; + unsigned char * _reserved_3[30]; + unsigned int _reserved_4[30]; + } _reserved_5; +#endif } _new; # ifndef _REENT_GLOBAL_ATEXIT