]> Savannah Git Hosting - gnulib.git/commitdiff
fnmatch-h: Fix test compilation error on mingw (regression from today).
authorBruno Haible <bruno@clisp.org>
Mon, 6 Aug 2018 22:25:13 +0000 (00:25 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 6 Aug 2018 22:25:13 +0000 (00:25 +0200)
* lib/fnmatch.in.h: Fix conditions.

ChangeLog
lib/fnmatch.in.h

index bf6b9a5a5d09696841e522c113e527df7c45fb85..69834cd12a9e2856e935b53916121def57f9282f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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+.
index bd0f0bf7e6c2675021ba1f7946be3a0d082a9d41..50eeed7aaaeb02b10e4099308b4ea05a5abaf62a 100644 (file)
@@ -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>.  */