From: Paul Eggert <eggert@cs.ucla.edu>
To: libc-alpha@gnu.org
Subject: [PATCH 2/3] Merge getopt patch from Gnulib
Date: Mon, 22 Aug 2022 15:58:33 -0500 [thread overview]
Message-ID: <20220822205834.563590-2-eggert@cs.ucla.edu> (raw)
In-Reply-To: <20220822205834.563590-1-eggert@cs.ucla.edu>
* posix/getopt.c [!_LIBC]: Merge _WIN32 patch from Gnulib
so that these source files are identical.
This makes no difference for glibc.
---
posix/getopt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/posix/getopt.c b/posix/getopt.c
index a160a4e3bd..128dc7fcf5 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -45,7 +45,8 @@
# define _(msgid) gettext (msgid)
/* When used standalone, flockfile and funlockfile might not be
available. */
-# ifndef _POSIX_THREAD_SAFE_FUNCTIONS
+# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
+ || (defined _WIN32 && ! defined __CYGWIN__))
# define flockfile(fp) /* nop */
# define funlockfile(fp) /* nop */
# endif
--
2.37.2
next prev parent reply other threads:[~2022-08-22 20:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 20:58 [PATCH 1/3] Merge _GL_UNUSED C23 " Paul Eggert
2022-08-22 20:58 ` Paul Eggert [this message]
2022-08-23 7:19 ` [PATCH 2/3] Merge getopt " Florian Weimer
2022-08-22 20:58 ` [PATCH 3/3] Merge tempname ASLR etc. " Paul Eggert
2022-08-23 7:19 ` Florian Weimer
2022-08-24 4:15 ` Paul Eggert
2022-08-23 7:16 ` [PATCH 1/3] Merge _GL_UNUSED C23 " Florian Weimer
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=20220822205834.563590-2-eggert@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=libc-alpha@gnu.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).