From 2a5588daeb27c118a3a55a203a7be14978d96bf7 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
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.

---
 includes.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes.h')

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 <glob.h>
 #endif
 #ifdef HAVE_ENDIAN_H
-- 
cgit v1.2.3