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 /includes.h | |
| parent | b5d5ee1ab0a2df1d5c6aea7ac8dadc4e8782bdd0 (diff) | |
- (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
diff --git a/includes.h b/includes.h index f1b47f666..6bb987807 100644 --- a/includes.h +++ b/includes.h | |||
| @@ -31,7 +31,8 @@ | |||
| 31 | #endif | 31 | #endif |
| 32 | #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ | 32 | #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \ |
| 33 | defined(GLOB_HAS_GL_MATCHC) && \ | 33 | defined(GLOB_HAS_GL_MATCHC) && \ |
| 34 | defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 | 34 | defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0 && \ |
| 35 | !defined(BROKEN_GLOB) | ||
| 35 | # include <glob.h> | 36 | # include <glob.h> |
| 36 | #endif | 37 | #endif |
| 37 | #ifdef HAVE_ENDIAN_H | 38 | #ifdef HAVE_ENDIAN_H |