kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-23 18:05:13 +00:00
parent cfd6e75c53
commit ca89b4e76c
7 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_features.c
View File

@@ -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));