From: Sean Bright <sean@malleable.com>
Date: Tue, 4 Nov 2008 17:23:33 +0000 (+0000)
Subject: GLOB_BRACE is already added to MY_GLOB_FLAGS if it is supported on the
X-Git-Tag: 1.6.2.0-beta1~955
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f349f18eaa39d9cae33103db9b723afee194abcc;p=thirdparty%2Fasterisk.git

GLOB_BRACE is already added to MY_GLOB_FLAGS if it is supported on the
platform.  This should resolve some build errors on Solaris.

(issue #13704)
Reported by: dougm


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@154191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 0df8b13776..438403e933 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6468,7 +6468,7 @@ int ast_load_documentation(void)
 	ast_asprintf(&xmlpattern, "%s/documentation{/thirdparty/,/}*-{%s,%.2s_??,%s}.xml", ast_config_AST_DATA_DIR,
 			documentation_language, documentation_language, default_documentation_language);
 	globbuf.gl_offs = 0;    /* initialize it to silence gcc */
-	globret = glob(xmlpattern, MY_GLOB_FLAGS | GLOB_BRACE, NULL, &globbuf);
+	globret = glob(xmlpattern, MY_GLOB_FLAGS, NULL, &globbuf);
 	if (globret == GLOB_NOSPACE) {
 		ast_log(LOG_WARNING, "Glob Expansion of pattern '%s' failed: Not enough memory\n", xmlpattern);
 		ast_free(xmlpattern);