Mercurial > gnulib
changeset 39774:a8ff12fcd1ea
fnmatch-h: Fix test compilation error on mingw (regression from today).
* lib/fnmatch.in.h: Fix conditions.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 07 Aug 2018 00:25:13 +0200 |
| parents | 1a0175e8c702 |
| children | 9e0852441f4b |
| files | ChangeLog lib/fnmatch.in.h |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Aug 06 15:50:58 2018 +0200 +++ b/ChangeLog Tue Aug 07 00:25:13 2018 +0200 @@ -1,3 +1,8 @@ +2018-08-06 Bruno Haible <bruno@clisp.org> + + fnmatch-h: Fix test compilation error on mingw (regression from today). + * lib/fnmatch.in.h: Fix conditions. + 2018-08-06 Bruno Haible <bruno@clisp.org> sys_resource: Relicense under LGPLv2+.
--- a/lib/fnmatch.in.h Mon Aug 06 15:50:58 2018 +0200 +++ b/lib/fnmatch.in.h Tue Aug 07 00:25:13 2018 +0200 @@ -25,7 +25,7 @@ @PRAGMA_COLUMNS@ /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_FNMATCH_H@ +#if @HAVE_FNMATCH_H@ && !@REPLACE_FNMATCH@ # @INCLUDE_NEXT@ @NEXT_FNMATCH_H@ #endif @@ -38,7 +38,7 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -#if !@HAVE_FNMATCH@ || @REPLACE_FNMATCH@ +#if !@HAVE_FNMATCH_H@ || @REPLACE_FNMATCH@ /* We #undef these before defining them because some losing systems (HP-UX A.08.07 for example) define these in <unistd.h>. */