diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-01-31 07:52:48 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-01-31 07:52:48 +0000 |
| commit | 324a3c1551c451dd1c6f0b93110be51400d09da3 (patch) | |
| tree | 2ab092935e25d16c4c791c3c13ef27a8c127379f /include | |
| parent | e3b475b0ad071cb09ebe70963797999dc9a19ea0 (diff) | |
Merged revisions 305040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r305040 | tilghman | 2011-01-31 01:51:40 -0600 (Mon, 31 Jan 2011) | 2 lines
Use the non-specific API aliases, to avoid a problem with building the utils directory.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 07522684f..fbcbecccf 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; } } |