From: Tilghman Lesher Date: Mon, 31 Jan 2011 07:51:40 +0000 (+0000) Subject: Use the non-specific API aliases, to avoid a problem with building the utils directory. X-Git-Tag: 1.8.4-rc1~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1440b054eb920125a050debf17196ff1f4a94beb;p=thirdparty%2Fasterisk.git Use the non-specific API aliases, to avoid a problem with building the utils directory. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@305040 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 07522684fb..fbcbecccf9 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -443,7 +443,7 @@ static inline void ast_reentrancy_init(struct ast_lock_track **plt) struct ast_lock_track *lt = *plt; if (!lt) { - lt = *plt = (struct ast_lock_track *) ast_calloc(1, sizeof(*lt)); + lt = *plt = (struct ast_lock_track *) calloc(1, sizeof(*lt)); } for (i = 0; i < AST_MAX_REENTRANCY; i++) { @@ -470,7 +470,7 @@ static inline void delete_reentrancy_cs(struct ast_lock_track **plt) if (*plt) { lt = *plt; pthread_mutex_destroy(<->reentr_mutex); - ast_free(lt); + free(lt); *plt = NULL; } }