2 files changed, 8 insertions, 4 deletions

diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 2e2551866..e2fd7c27f 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -37,7 +37,8 @@
 #include "includes.h"
 #include <ctype.h>
 
-#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC)
+#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
+    !defined(GLOB_HAS_GL_MATCHC)
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -855,5 +856,6 @@ qprintf(str, s)
 }
 #endif
 
-#endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) */
+#endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) ||
+          !defined(GLOB_HAS_GL_MATCHC) */
 
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 392c63b67..a08cee572 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -39,7 +39,8 @@
  *      @(#)glob.h      8.1 (Berkeley) 6/2/93
  */
 
-#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC)
+#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
+    !defined(GLOB_HAS_GL_MATCHC)
 
 #ifndef _GLOB_H_
 #define _GLOB_H_
@@ -94,5 +95,6 @@ void	globfree __P((glob_t *));
 
 #endif /* !_GLOB_H_ */
 
-#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) */
+#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC)  ||
+          !defined(GLOB_HAS_GL_MATCHC */