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

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(&lt->reentr_mutex);
-		ast_free(lt);
+		free(lt);
 		*plt = NULL;
 	}
 }