[svn-commits] tilghman: trunk r305041 - in /trunk: ./ include/asterisk/lock.h

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Jan 31 01:52:48 2011
New Revision: 305041

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305041
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/lock.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk/lock.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/lock.h?view=diff&rev=305041&r1=305040&r2=305041
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Mon Jan 31 01:52:48 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;
 	}
 }