From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 24 Aug 2022 04:16:40 +0000 (-0700)
Subject: Merge getopt patch from Gnulib
X-Git-Tag: glibc-2.37~404
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06e4033c83276ed349d315bfbf651be56c3e2954;p=thirdparty%2Fglibc.git

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 --git a/posix/getopt.c b/posix/getopt.c
index a160a4e3bd8..128dc7fcf54 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