summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-08-20 16:16:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-08-20 16:16:01 +1000
commit2a5588daeb27c118a3a55a203a7be14978d96bf7 (patch)
treeda4cc6ae017e9a21e773b589569c98c47fa548f0
parentb5d5ee1ab0a2df1d5c6aea7ac8dadc4e8782bdd0 (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.
-rw-r--r--ChangeLog5
-rw-r--r--includes.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61ba1ed7b..056240f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120090820
2 - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
3 using it since the type conflicts can cause problems on FreeBSD. Patch
4 from Jonathan Chen.
5
120090817 620090817
2 - (dtucker) [configure.ac] Check for headers before libraries for openssl an 7 - (dtucker) [configure.ac] Check for headers before libraries for openssl an
3 zlib, which should make the errors slightly more meaningful on platforms 8 zlib, which should make the errors slightly more meaningful on platforms
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