diff options
| author | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-21 14:00:55 +0000 |
|---|---|---|
| committer | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-21 14:00:55 +0000 |
| commit | 607a203e201dece83b2e2eb8dd40039b23a2d358 (patch) | |
| tree | d3893fa76a31c89c99116488be38db303133dac9 /main | |
| parent | a3720841ae07657c947fc2fea90586bcdb89e9d2 (diff) | |
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.4@189601 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/main/config.c b/main/config.c index 6163f827a..4fc929c6f 100644 --- a/main/config.c +++ b/main/config.c @@ -39,9 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/stat.h> #define AST_INCLUDE_GLOB 1 #ifdef AST_INCLUDE_GLOB -#if defined(__Darwin__) || defined(__CYGWIN__) -#define GLOB_ABORTED GLOB_ABEND -#endif # include <glob.h> #endif @@ -852,11 +849,7 @@ static struct ast_config *config_text_file_load(const char *database, const char int glob_ret; glob_t globbuf; globbuf.gl_offs = 0; /* initialize it to silence gcc */ -#ifdef SOLARIS - glob_ret = glob(fn, GLOB_NOCHECK, NULL, &globbuf); -#else - glob_ret = glob(fn, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf); -#endif + glob_ret = glob(fn, MY_GLOB_FLAGS, NULL, &globbuf); if (glob_ret == GLOB_NOSPACE) ast_log(LOG_WARNING, "Glob Expansion of pattern '%s' failed: Not enough memory\n", fn); |