diff options
| author | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-21 15:20:22 +0000 |
|---|---|---|
| committer | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-21 15:20:22 +0000 |
| commit | 772414a4d7aca4bac4b5bd0a6d53ebd282dfd529 (patch) | |
| tree | cf1a70c72dc3b330ba2fba748b78a9b04076a4ec /include | |
| parent | d7618b6953f3e8c1eb6fb01ff5f8b0f3936a8018 (diff) | |
Merged revisions 189629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r189629 | dbailey | 2009-04-21 09:28:04 -0500 (Tue, 21 Apr 2009) | 10 lines
Merged revisions 189601 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r189601 | dbailey | 2009-04-21 09:00:55 -0500 (Tue, 21 Apr 2009) | 3 lines
Add check in configure script to check for GLOB_NOMAGIC and GLOB_BRACE in glob.h
This allows config.c to compile when linked against uclibc that does not support these parameters
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@189642 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 12 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 336ab8cfe..00adfb200 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -328,6 +328,18 @@ /* Define to 1 if you have the `glob' function. */ #undef HAVE_GLOB +/* Define if your system has the GLOB_BRACE headers. */ +#undef HAVE_GLOB_BRACE + +/* Define GLOB_BRACE headers version */ +#undef HAVE_GLOB_BRACE_VERSION + +/* Define if your system has the GLOB_NOMAGIC headers. */ +#undef HAVE_GLOB_NOMAGIC + +/* Define GLOB_NOMAGIC headers version */ +#undef HAVE_GLOB_NOMAGIC_VERSION + /* Define if your system has the GMIME libraries. */ #undef HAVE_GMIME diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index d828b5270..6565687e2 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -182,4 +182,15 @@ typedef unsigned int uint; typedef unsigned long long uint64_t; #endif +/* glob compat stuff */ +#if defined(__Darwin__) || defined(__CYGWIN__) +#define GLOB_ABORTED GLOB_ABEND +#endif +#include <glob.h> +#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) +#define MY_GLOB_FLAGS GLOB_NOCHECK +#else +#define MY_GLOB_FLAGS (GLOB_NOMAGIC | GLOB_BRACE) +#endif + #endif |