diff options
| author | dtucker <dtucker> | 2009-08-20 06:16:01 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2009-08-20 06:16:01 +0000 |
| commit | a89818e680f363d73136df1c8289af52fb05f6da (patch) | |
| tree | 23a356d8af180e624844a14322ea1b8f1d3eee71 /includes.h | |
| parent | 3eb0d3bceef5f359ca1ad0becae4b4167a559a5a (diff) | |
| download | openssh-a89818e680f363d73136df1c8289af52fb05f6da.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.
Diffstat (limited to 'includes.h')
| -rw-r--r-- | includes.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |