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

Merged revisions 71422 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r71422 | file | 2007-06-24 21:07:31 -0400 (Sun, 24 Jun 2007) | 2 lines

Fix it so 1.4 actually compiles on my box.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-06-25 01:08:22 +00:00
parent 8bab6c1f69
commit 694088e06f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/cdr.c
View File

@@ -528,7 +528,7 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
if (ast_test_flag(from, AST_CDR_FLAG_LOCKED)) { if (ast_test_flag(from, AST_CDR_FLAG_LOCKED)) {
discard_from = 1; discard_from = 1;
if (lto) { if (lto) {
struct ast_cdr *llfrom; struct ast_cdr *llfrom = NULL;
/* insert the from stuff after lto */ /* insert the from stuff after lto */
lto->next = from; lto->next = from;
lfrom = from; lfrom = from;
@@ -543,7 +543,7 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
} else { } else {
/* save copy of the current *to cdr */ /* save copy of the current *to cdr */
struct ast_cdr tcdr; struct ast_cdr tcdr;
struct ast_cdr *llfrom; struct ast_cdr *llfrom = NULL;
memcpy(&tcdr, to, sizeof(tcdr)); memcpy(&tcdr, to, sizeof(tcdr));
/* copy in the locked from cdr */ /* copy in the locked from cdr */
memcpy(to, from, sizeof(*to)); memcpy(to, from, sizeof(*to));