Import of OpenSSH 4.4p1

[gssapi-openssh.git] / openssh / openbsd-compat / glob.h

diff --git a/openssh/openbsd-compat/glob.h b/openssh/openbsd-compat/glob.h
index 4fdbfc1eabd8ef8c149c91161046e12d13f8bf35..9ba07f76edaa5dd9b1e9b8578ed3c19e197579b8 100644 (file)
--- a/openssh/openbsd-compat/glob.h
+++ b/openssh/openbsd-compat/glob.h
@@ -38,7 +38,8 @@
 /* OPENBSD ORIGINAL: include/glob.h */
 
 #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
-    !defined(GLOB_HAS_GL_MATCHC)
+    !defined(GLOB_HAS_GL_MATCHC) || \
+    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0
 
 #ifndef _GLOB_H_
 #define        _GLOB_H_