From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1211) id D3E04385AC2A; Wed, 24 Aug 2022 04:59:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3E04385AC2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661317155; bh=ZFKhQmi/dMKeWE5jVmkqTdjYEjz4YT1sOTcw6q9l4nI=; h=From:To:Subject:Date:From; b=dqIGgX5vzrui2lGU2eBx1YcY/vm/YvbdZ0aH+G6gPVq2YYPj6d+AhgXc5s4VyY5Xu 71B7kyh7UlSBmeZ5B6hI7wsy417Z40BDYz5r/Nm4M1cG0oh1TALc9iH+FNa+jCGZ7G POTz4R0MK8FhICbBV8/5hBW4gCIFxz76UXkDuFgQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Paul Eggert To: glibc-cvs@sourceware.org Subject: [glibc] Merge getopt patch from Gnulib X-Act-Checkin: glibc X-Git-Author: Paul Eggert X-Git-Refname: refs/heads/master X-Git-Oldrev: 464138e90497be474fdbb19eebc0269ea24c5ce1 X-Git-Newrev: 06e4033c83276ed349d315bfbf651be56c3e2954 Message-Id: <20220824045915.D3E04385AC2A@sourceware.org> Date: Wed, 24 Aug 2022 04:59:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=06e4033c83276ed349d315bfbf651be56c3e2954 commit 06e4033c83276ed349d315bfbf651be56c3e2954 Author: Paul Eggert 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