From 2a5588daeb27c118a3a55a203a7be14978d96bf7 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 20 Aug 2009 16:16:01 +1000 Subject: - (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. --- ChangeLog | 5 +++++ includes.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61ba1ed7..056240f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/includes.h b/includes.h index f1b47f66..6bb98780 100644 --- a/includes.h +++ b/includes.h @@ -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 #endif #ifdef HAVE_ENDIAN_H -- cgit v1.2.1