From 86511f89fb434314c672fc223b38b159aa270d52 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Tue, 14 Jun 2005 14:45:51 +0000 Subject: [PATCH] don't use pthread_mutex_lock don't double-include pthread.h in utils.h, which can cause the pthread_mutex_lock warning to not be generated on some systems git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5906 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr.c | 8 ++++---- include/asterisk/utils.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cdr.c b/cdr.c index 4b277a412f..6ea359bcd1 100755 --- a/cdr.c +++ b/cdr.c @@ -940,9 +940,9 @@ static void submit_unscheduled_batch(void) /* schedule the submission to occur ASAP (1 ms) */ cdr_sched = ast_sched_add(sched, 1, submit_scheduled_batch, NULL); /* signal the do_cdr thread to wakeup early and do some work (that lazy thread ;) */ - pthread_mutex_lock(&cdr_pending_lock); + ast_mutex_lock(&cdr_pending_lock); pthread_cond_signal(&cdr_pending_cond); - pthread_mutex_unlock(&cdr_pending_lock); + ast_mutex_unlock(&cdr_pending_lock); } void ast_cdr_detach(struct ast_cdr *cdr) @@ -1017,10 +1017,10 @@ static void *do_cdr(void *data) timeout.tv_sec = now.tv_sec + (schedms / 1000); timeout.tv_nsec = (now.tv_usec * 1000) + ((schedms % 1000) * 1000); /* prevent stuff from clobbering cdr_pending_cond, then wait on signals sent to it until the timeout expires */ - pthread_mutex_lock(&cdr_pending_lock); + ast_mutex_lock(&cdr_pending_lock); pthread_cond_timedwait(&cdr_pending_cond, &cdr_pending_lock, &timeout); numevents = ast_sched_runq(sched); - pthread_mutex_unlock(&cdr_pending_lock); + ast_mutex_unlock(&cdr_pending_lock); if (option_debug > 1) ast_log(LOG_DEBUG, "Processed %d scheduled CDR batches from the run queue\n", numevents); } diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 9fb0b83cd8..9cabe679d4 100755 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -19,7 +19,6 @@ #include <netinet/in.h> #include <arpa/inet.h> /* we want to override inet_ntoa */ #include <netdb.h> -#include <pthread.h> #include <limits.h> #include "asterisk/lock.h" -- GitLab