about summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2022-08-23 21:16:40 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2022-08-23 21:58:39 -0700
commit06e4033c83276ed349d315bfbf651be56c3e2954 (patch)
tree74791a741e56c1ae9c160b05297a00dd512949af /posix
parent464138e90497be474fdbb19eebc0269ea24c5ce1 (diff)
downloadglibc-06e4033c83276ed349d315bfbf651be56c3e2954.tar.gz
glibc-06e4033c83276ed349d315bfbf651be56c3e2954.tar.xz
glibc-06e4033c83276ed349d315bfbf651be56c3e2954.zip
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.
Diffstat (limited to 'posix')
-rw-r--r--posix/getopt.c3
1 files changed, 2 insertions, 1 deletions
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