[Asterisk-cvs] asterisk/cdr cdr_odbc.c,1.12,1.13 cdr_pgsql.c,1.6,1.7

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/cdr
In directory mongoose.digium.com:/tmp/cvs-serv11896/cdr

Modified Files:
	cdr_odbc.c cdr_pgsql.c 
Log Message:
Merge FreeBSD locking fixes (bug #1411)


Index: cdr_odbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_odbc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cdr_odbc.c	21 May 2004 00:40:02 -0000	1.12
+++ cdr_odbc.c	9 Jun 2004 01:45:07 -0000	1.13
@@ -41,7 +41,7 @@
 static int dsn_alloc = 0, username_alloc = 0, password_alloc = 0, loguniqueid_alloc = 0;
 static int connected = 0;
 
-static ast_mutex_t odbc_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(odbc_lock);
 
 static int odbc_do_query(void);
 static int odbc_init(void);

Index: cdr_pgsql.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_pgsql.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cdr_pgsql.c	22 Jan 2004 17:03:11 -0000	1.6
+++ cdr_pgsql.c	9 Jun 2004 01:45:07 -0000	1.7
@@ -41,7 +41,7 @@
 static int hostname_alloc = 0, dbname_alloc = 0, dbuser_alloc = 0, password_alloc = 0, dbsock_alloc = 0, dbport_alloc = 0;
 static int connected = 0;
 
-static ast_mutex_t pgsql_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(pgsql_lock);
 
 PGconn		*conn;
 PGresult	*result;