diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-11 15:27:38 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-11 15:27:38 +0000 |
| commit | fa4d9273e46e42884603f241d7b41d2567687679 (patch) | |
| tree | e4381a03f03f9ac586e0bb695866496a3a4d5215 /cdr.c | |
| parent | 24dc28a81f7271801556aae841d3573e66f2855f (diff) | |
Merged revisions 9493,9528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r9493 | bweschke | 2006-02-11 00:29:34 -0600 (Sat, 11 Feb 2006) | 3 lines
kpfleming's fix from r9472 backported to 1.2
........
r9528 | kpfleming | 2006-02-11 09:22:55 -0600 (Sat, 11 Feb 2006) | 2 lines
clean up my mess from thread-starting change
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9529 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr.c')
| -rw-r--r-- | cdr.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1120,7 +1120,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); @@ -1181,7 +1180,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 { |