automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-05 06:04:09 +00:00
parent 06352345c1
commit ee2918d783
11 changed files with 95 additions and 31 deletions

View File

@@ -3440,7 +3440,7 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
}
for (/* ever */;;) {
struct timeval now;
struct timeval now = { 0, };
int to;
to = -1;