public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Sebastian Huber <sh@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] Optional struct _reent::__unused_sdidinit
Date: Wed, 18 May 2022 05:58:04 +0000 (GMT)	[thread overview]
Message-ID: <20220518055804.8AEC23857402@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ad6d271eb6d5c31e16b8fae3f7d0ab2c14c70d6b

commit ad6d271eb6d5c31e16b8fae3f7d0ab2c14c70d6b
Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date:   Fri May 13 14:40:07 2022 +0200

    Optional struct _reent::__unused_sdidinit
    
    Rename struct _reent member __unused_sdidinit to _reserved_0.  Provide it only
    if _REENT_BACKWARD_BINARY_COMPAT is defined.

Diff:
---
 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, \


                 reply	other threads:[~2022-05-18  5:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220518055804.8AEC23857402@sourceware.org \
    --to=sh@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).