automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-11 16:03:16 +00:00
parent 744ec2c02e
commit 18dbcd321d
2 changed files with 1 additions and 3 deletions

3
cdr.c
View File

@@ -1136,7 +1136,6 @@ static int do_reload(void)
int was_enabled;
int was_batchmode;
int res=0;
pthread_attr_t attr;
ast_mutex_lock(&cdr_batch_lock);
@@ -1197,7 +1196,7 @@ static int do_reload(void)
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
} else {