diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-09 01:45:08 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-09 01:45:08 +0000 |
| commit | 7d00f23ad44d18c7041c925f7f556d5d1fe641ac (patch) | |
| tree | e9c8ee99dcb97720b3dfb49c87b2f2c0b6f6f6b6 /channels/chan_vpb.c | |
| parent | 523e96fd0323806ed98ca6ce3e58831fc5a392dc (diff) | |
Merge FreeBSD locking fixes (bug #1411)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3176 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_vpb.c')
| -rwxr-xr-x | channels/chan_vpb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c index c578946e0..7528a0f20 100755 --- a/channels/chan_vpb.c +++ b/channels/chan_vpb.c @@ -69,14 +69,14 @@ static int gruntdetect_timeout = 3600000; /* Grunt detect timeout is 1hr. */ static const int prefformat = AST_FORMAT_SLINEAR; -static ast_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(usecnt_lock); /* Protect the interface list (of vpb_pvt's) */ -static ast_mutex_t iflock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(iflock); /* 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 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. */ @@ -171,7 +171,7 @@ typedef struct { static vpb_bridge_t * bridges; static int max_bridges = MAX_BRIDGES_V4PCI; -static ast_mutex_t bridge_lock = AST_MUTEX_INITIALIZER; +AST_MUTEX_DEFINE_STATIC(bridge_lock); typedef enum { vpb_model_unknown = 0, |