* lib/fnmatch.in.h: Fix conditions.
+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+.
@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
/* 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>. */