diff options
| author | Mark Spencer <markster@digium.com> | 2004-06-09 01:45:08 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-06-09 01:45:08 +0000 |
| commit | 727abcdec7ad92fc2fae2585c5c609e0663858a6 (patch) | |
| tree | e9c8ee99dcb97720b3dfb49c87b2f2c0b6f6f6b6 /channels/chan_mgcp.c | |
| parent | c96046b6c2c34b77bcc8a86ab5816c092d21bd7b (diff) | |
Merge FreeBSD locking fixes (bug #1411)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_mgcp.c')
| -rwxr-xr-x | channels/chan_mgcp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 27adaccfa..740731eab 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -199,7 +199,7 @@ static int adsi = 0; static int usecnt =0; -static ast_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(usecnt_lock); /* SC: transaction id should always be positive */ static unsigned int oseq; @@ -214,9 +214,9 @@ static int matchdigittimeout = 3000; /* Protect the monitoring thread, so only one process can kill or start it, and not when it's doing something critical. */ -static ast_mutex_t netlock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(netlock); -static ast_mutex_t monlock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(monlock); /* This is the thread for the monitor which checks for input on the channels which are not currently in use. */ @@ -419,10 +419,10 @@ static struct mgcp_gateway { struct mgcp_gateway *next; } *gateways; -static ast_mutex_t mgcp_reload_lock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(mgcp_reload_lock); static int mgcp_reloading = 0; -static ast_mutex_t gatelock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(gatelock); static int mgcpsock = -1; |