summaryrefslogtreecommitdiffstats
path: root/includes.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-01 20:29:10 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-01 20:29:10 +1000
commit096faecdea1e39ecace0b20f4e208bd7ec33f6d2 (patch)
tree7756d6d5fefe40aab00431d47075175a5641b9a1 /includes.h
parent0646ca6be81c4f0f619d92a4e5a041b58c79a221 (diff)
- (dtucker) [configure.ac includes.h openbsd-compat/glob.{c,h}] Explicitly
test for GLOB_NOMATCH and use our glob functions if it's not found. Stops sftp from segfaulting when attempting to get a nonexistent file on Cygwin (previous versions of OpenSSH didn't use the native glob). Partly from and tested by Corinna Vinschen.
Diffstat (limited to 'includes.h')
-rw-r--r--includes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes.h b/includes.h
index 2101f13c..967fcc26 100644
--- a/includes.h
+++ b/includes.h
@@ -30,7 +30,8 @@
# include <bstring.h>
#endif
#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
# include <glob.h>
#endif
#ifdef HAVE_ENDIAN_H