From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 1 Dec 2009 23:39:49 +0000 (+0000)
Subject: Merged revisions 232012 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=650c94b67af0a62e7f4261ff4198911b95e7061d;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@232014 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 5d116e82c8..f63a08c19d 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -46,7 +46,7 @@ AST_LIST_HEAD_STATIC(locklist, lock_frame);
 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",