Merge config updates (bug #3406)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions

View File

@@ -865,7 +865,7 @@ static int load_moh_classes(void)
char *args;
int x = 0;
cfg = ast_load("musiconhold.conf");
cfg = ast_config_load("musiconhold.conf");
if (!cfg)
return 0;
@@ -897,7 +897,7 @@ static int load_moh_classes(void)
var = var->next;
}
ast_destroy(cfg);
ast_config_destroy(cfg);
return x;
}