From ad6d271eb6d5c31e16b8fae3f7d0ab2c14c70d6b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 May 2022 14:40:07 +0200 Subject: [PATCH] Optional struct _reent::__unused_sdidinit Rename struct _reent member __unused_sdidinit to _reserved_0. Provide it only if _REENT_BACKWARD_BINARY_COMPAT is defined. --- newlib/libc/include/sys/reent.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h index fa9ac57da..fc289b531 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -342,6 +342,12 @@ struct _rand48 { #define _REENT_ASCTIME_SIZE 26 #define _REENT_SIGNAL_SIZE 24 +#ifdef _REENT_BACKWARD_BINARY_COMPAT +#define _REENT_INIT_RESERVED_0 0, +#else +#define _REENT_INIT_RESERVED_0 /* Nothing to initialize */ +#endif + /* * struct _reent * @@ -395,9 +401,9 @@ struct _reent char *_emergency; - /* No longer used, but member retained for binary compatibility. - Now, the __cleanup member is used to check initialization. */ - int _unused_sdidinit; +#ifdef _REENT_BACKWARD_BINARY_COMPAT + int _reserved_0; +#endif int _unspecified_locale_info; /* unused, reserved for locale stuff */ struct __locale_t *_locale;/* per-thread locale */ @@ -440,7 +446,7 @@ struct _reent &__sf[2], \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_RESERVED_0 \ 0, \ _NULL, \ _NULL, \ @@ -478,7 +484,7 @@ extern const struct __sFILE_fake __sf_fake_stderr; (__FILE *)&__sf_fake_stderr, \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_RESERVED_0 \ 0, \ _NULL, \ _NULL, \ @@ -633,9 +639,9 @@ struct _reent int _unspecified_locale_info; /* unused, reserved for locale stuff */ struct __locale_t *_locale;/* per-thread locale */ - /* No longer used, but member retained for binary compatibility. - Now, the __cleanup member is used to check initialization. */ - int _unused_sdidinit; +#ifdef _REENT_BACKWARD_BINARY_COMPAT + int _reserved_0; +#endif void (*__cleanup) (struct _reent *); @@ -723,7 +729,7 @@ struct _reent "", \ 0, \ _NULL, \ - 0, \ + _REENT_INIT_RESERVED_0 \ _NULL, \ _NULL, \ 0, \ -- 2.43.5