commit e3461d1c21a99bcef1b8826f710434e0ffb5adea
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sun Jun 11 15:53:09 2017 -0700

    getopt-posix: port to glibc 2.25.90
    
    Problem reported by Daniel P. Berrange in:
    http://lists.gnu.org/archive/html/bug-gnulib/2017-06/msg00003.html
    * lib/getopt-pfx-core.h (_GETOPT_CORE_H):
    * lib/getopt-pfx-ext.h (_GETOPT_EXT_H):
    #undef if __GETOPT_PREFIX is defined.

diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h
index 155c11612..6ad0da683 100644
--- a/lib/getopt-pfx-core.h
+++ b/lib/getopt-pfx-core.h
@@ -47,6 +47,11 @@
 # define opterr __GETOPT_ID (opterr)
 # define optind __GETOPT_ID (optind)
 # define optopt __GETOPT_ID (optopt)
+
+/* The system's getopt.h may have already included getopt-core.h to
+   declare the unprefixed identifiers.  Undef _GETOPT_CORE_H so that
+   getopt-core.h declares them with prefixes.  */
+# undef _GETOPT_CORE_H
 #endif
 
 #include <getopt-core.h>
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index d960bb34e..c5ac52202 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -45,6 +45,11 @@
 # define getopt_long_only __GETOPT_ID (getopt_long_only)
 # define option __GETOPT_ID (option)
 # define _getopt_internal __GETOPT_ID (getopt_internal)
+
+/* The system's getopt.h may have already included getopt-ext.h to
+   declare the unprefixed identifiers.  Undef _GETOPT_EXT_H so that
+   getopt-ext.h declares them with prefixes.  */
+# undef _GETOPT_EXT_H
 #endif
 
 /* Standalone applications get correct prototypes for getopt_long and
 type='hidden' name='id' value='29a8c05cf33d27608c0e5ee1351cb88e52ba8f59'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=29a8c05cf33d27608c0e5ee1351cb88e52ba8f59'>root</a>/<a href='/guix/log/tests?id=29a8c05cf33d27608c0e5ee1351cb88e52ba8f59'>tests</a>/<a href='/guix/log/tests/git.scm?id=29a8c05cf33d27608c0e5ee1351cb88e52ba8f59'>git.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/git.scm?id=29a8c05cf33d27608c0e5ee1351cb88e52ba8f59&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-09-18 19:37:45 +0200'>2021-09-18</span></td><td><a href='/guix/commit/tests/git.scm?id=59ee10754eddddb99e4a80b9e18aa12ed1b3d77a'>import: Add 'generic-git' updater.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/git.scm (ls-remote-refs): New procedure.
* tests/git.scm ("remote-refs" "remote-refs: only tags"): New tests.
* guix/import/git.scm: New file.
* doc/guix.texi (Invoking guix refresh): Document it.
* tests/import-git.scm: New test file.
* Makefile.am (MODULES, SCM_TESTS): Register the new files.

Co-authored-by: Sarah Morgensen &lt;iskarian@mgsn.dev&gt;
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Xinglu Chen</td></tr>
<tr><td><span title='2020-06-09 00:34:52 +0200'>2020-06-09</span></td><td><a href='/guix/commit/tests/git.scm?id=72357e2170e88f73c11ff089f87a744cee8606ec'>git: 'commit-difference' really excludes the ancestors of #:excluded.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/git.scm (commit-difference): Initialize VISITED to the closure of
OLD and EXCLUDED, as written in the docstring.
* tests/git.scm ("commit-difference, excluded commits"): Adjust
accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-25 00:00:28 +0200'>2020-05-25</span></td><td><a href='/guix/commit/tests/git.scm?id=c098c11be8eb9e0c12be42640721e3cb21c37628'>git: Add 'commit-relation'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/git.scm (commit-relation): New procedure.
* tests/git.scm ("commit-relation"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-27 13:52:49 +0100'>2019-12-27</span></td><td><a href='/guix/commit/tests/git.scm?id=785af04a7574867dc940c791daa938a2432d0450'>git: 'commit-difference' takes a list of excluded commits.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/git.scm (commit-closure): Add 'visited' optional parameter.
(commit-difference): Add 'excluded' optional parameter; pass second
argument to 'commit-closure'.
* tests/git.scm ("commit-difference, excluded commits"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-23 10:38:43 +0200'>2019-09-23</span></td><td><a href='/guix/commit/tests/git.scm?id=873f6f1334ab06a69e768a8aea0054404237542f'>git: Add 'commit-difference'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/git.scm (commit-closure, commit-difference): New procedures.
* guix/tests/git.scm, tests/git.scm: New files.
* Makefile.am (dist_noinst_DATA): Add guix/tests/git.scm.
(SCM_TESTS): Add tests/git.scm.
</span></span></td><td>Ludovic Courtès</td></tr>