mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@189601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user