public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Merge getopt patch from Gnulib
@ 2022-08-24  4:59 Paul Eggert
  0 siblings, 0 replies; only message in thread
From: Paul Eggert @ 2022-08-24  4:59 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=06e4033c83276ed349d315bfbf651be56c3e2954

commit 06e4033c83276ed349d315bfbf651be56c3e2954
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Aug 23 21:16:40 2022 -0700

    Merge getopt patch from Gnulib
    
    * posix/getopt.c [!_LIBC]: Merge _WIN32 patch from Gnulib
    so that these source files are identical.
    This makes no difference for glibc.

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

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2022-08-24  4:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-24  4:59 [glibc] Merge getopt patch from Gnulib Paul Eggert

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).