GLOB_BRACE is already added to MY_GLOB_FLAGS if it is supported on the
authorSean Bright <sean@malleable.com>
Tue, 4 Nov 2008 17:23:33 +0000 (17:23 +0000)
committerSean Bright <sean@malleable.com>
Tue, 4 Nov 2008 17:23:33 +0000 (17:23 +0000)
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

main/pbx.c

index 0df8b13..438403e 100644 (file)
@@ -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 */
        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);
        if (globret == GLOB_NOSPACE) {
                ast_log(LOG_WARNING, "Glob Expansion of pattern '%s' failed: Not enough memory\n", xmlpattern);
                ast_free(xmlpattern);