From c6d92bd5ede1ad472cacf08e433644762cba4a66 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 7 Aug 2018 00:25:13 +0200 Subject: [PATCH] fnmatch-h: Fix test compilation error on mingw (regression from today). * lib/fnmatch.in.h: Fix conditions. --- ChangeLog | 5 +++++ lib/fnmatch.in.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf6b9a5a5d..69834cd12a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-06 Bruno Haible + + fnmatch-h: Fix test compilation error on mingw (regression from today). + * lib/fnmatch.in.h: Fix conditions. + 2018-08-06 Bruno Haible sys_resource: Relicense under LGPLv2+. 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 . */ -- 2.39.5