diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-08-20 16:16:01 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-08-20 16:16:01 +1000 |
commit | 2a5588daeb27c118a3a55a203a7be14978d96bf7 (patch) | |
tree | da4cc6ae017e9a21e773b589569c98c47fa548f0 | |
parent | b5d5ee1ab0a2df1d5c6aea7ac8dadc4e8782bdd0 (diff) | |
download | openssh-git-2a5588daeb27c118a3a55a203a7be14978d96bf7.tar.gz |
- (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
using it since the type conflicts can cause problems on FreeBSD. Patch
from Jonathan Chen.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | includes.h | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + 20090817 - (dtucker) [configure.ac] Check for headers before libraries for openssl an zlib, which should make the errors slightly more meaningful on platforms @@ -31,7 +31,8 @@ #endif #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ defined(GLOB_HAS_GL_MATCHC) && \ - defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 + defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 && \ + !defined(BROKEN_GLOB) # include <glob.h> #endif #ifdef HAVE_ENDIAN_H |