aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-23 18:05:13 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-23 18:05:13 +0000
commite005dbccdff80ceb02ce7cc8576852c80e520e56 (patch)
tree1e2b07a7aa75eadc062fcad4be36f3355b0610d4 /res
parentcc6e91422e06fcf597f039d73159505355474ac7 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29762 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 885f4a7d7..a122abf5f 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -866,7 +866,7 @@ struct ast_call_feature builtin_features[] =
};
-static AST_LIST_HEAD(feature_list,ast_call_feature) feature_list;
+static AST_LIST_HEAD_STATIC(feature_list,ast_call_feature);
/* register new feature into feature_list*/
void ast_register_feature(struct ast_call_feature *feature)
@@ -2145,7 +2145,6 @@ int load_module(void)
{
int res;
- AST_LIST_HEAD_INIT(&feature_list);
memset(parking_ext, 0, sizeof(parking_ext));
memset(parking_con, 0, sizeof(parking_con));