diff options
| author | Bruno Haible <bruno@clisp.org> | 2018-08-07 00:25:13 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2018-08-07 00:25:13 +0200 |
| commit | c6d92bd5ede1ad472cacf08e433644762cba4a66 (patch) | |
| tree | 1988680e5394af53ef3a6f13450042361c427029 | |
| parent | a768cf0983c4cb2286b886cd888a10dab789c888 (diff) | |
| download | gnulib-c6d92bd5ede1ad472cacf08e433644762cba4a66.tar.gz | |
fnmatch-h: Fix test compilation error on mingw (regression from today).
* lib/fnmatch.in.h: Fix conditions.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fnmatch.in.h | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ 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+. John Malmberg's approval is in <https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00031.html>. diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index bd0f0bf7e6..50eeed7aaa 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -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>. */ |