[asterisk-commits] tilghman: branch 1.8 r305040 - /branches/1.8/include/asterisk/lock.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan 31 01:51:40 2011
New Revision: 305040

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305040
Log:
Use the non-specific API aliases, to avoid a problem with building the utils directory.

Modified:
    branches/1.8/include/asterisk/lock.h

Modified: branches/1.8/include/asterisk/lock.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/lock.h?view=diff&rev=305040&r1=305039&r2=305040
==============================================================================
--- branches/1.8/include/asterisk/lock.h (original)
+++ branches/1.8/include/asterisk/lock.h Mon Jan 31 01:51:40 2011
@@ -443,7 +443,7 @@
 	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 @@
 	if (*plt) {
 		lt = *plt;
 		pthread_mutex_destroy(&lt->reentr_mutex);
-		ast_free(lt);
+		free(lt);
 		*plt = NULL;
 	}
 }