[svn-commits] russell: branch 1.6.1 r232014 - in /branches/1.6.1: ./ funcs/func_lock.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec  1 17:39:49 2009
New Revision: 232014

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232014
Log:
Merged revisions 232012 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r232012 | russell | 2009-12-01 17:38:34 -0600 (Tue, 01 Dec 2009) | 2 lines
  
  Fix a build error on FreeBSD.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_lock.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_lock.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/funcs/func_lock.c?view=diff&rev=232014&r1=232013&r2=232014
==============================================================================
--- branches/1.6.1/funcs/func_lock.c (original)
+++ branches/1.6.1/funcs/func_lock.c Tue Dec  1 17:39:49 2009
@@ -46,7 +46,7 @@
 static void lock_free(void *data);
 static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan);
 static int unloading = 0;
-static pthread_t broker_tid = -1;
+static pthread_t broker_tid = AST_PTHREADT_NULL;
 
 static struct ast_datastore_info lock_info = {
 	.type = "MUTEX",