tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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.
This commit is contained in:
Darren Tucker 2009-08-20 16:16:01 +10:00
parent b5d5ee1ab0
commit 2a5588daeb
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 20090817
- (dtucker) [configure.ac] Check for headers before libraries for openssl an - (dtucker) [configure.ac] Check for headers before libraries for openssl an
zlib, which should make the errors slightly more meaningful on platforms zlib, which should make the errors slightly more meaningful on platforms

3
includes.h
View File

@ -31,7 +31,8 @@
#endif #endif
#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ #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 defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 && \
!defined(BROKEN_GLOB)
# include <glob.h> # include <glob.h>
#endif #endif
#ifdef HAVE_ENDIAN_H #ifdef HAVE_ENDIAN_H