[svn-commits] trunk r20075 - in /trunk: cdr/cdr_odbc.c funcs/func_odbc.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Fri Apr 14 13:44:24 2006
New Revision: 20075

URL: http://svn.digium.com/view/asterisk?rev=20075&view=rev
Log:
Compatibility fixes for loader changes

Modified:
    trunk/cdr/cdr_odbc.c
    trunk/funcs/func_odbc.c

Modified: trunk/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_odbc.c?rev=20075&r1=20074&r2=20075&view=diff
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Fri Apr 14 13:44:24 2006
@@ -199,7 +199,7 @@
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
@@ -450,34 +450,25 @@
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	return odbc_load_module();
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	return odbc_unload_module();
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	odbc_unload_module();
 	return odbc_load_module();
 }
 
-int usecount(void)
-{
-	/* Simplistic use count */
-	if (ast_mutex_trylock(&odbc_lock)) {
-		return 1;
-	} else {
-		ast_mutex_unlock(&odbc_lock);
-		return 0;
-	}
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_0, reload, NULL, NULL);

Modified: trunk/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_odbc.c?rev=20075&r1=20074&r2=20075&view=diff
==============================================================================
--- trunk/funcs/func_odbc.c (original)
+++ trunk/funcs/func_odbc.c Fri Apr 14 13:44:24 2006
@@ -551,7 +551,7 @@
 	return 0;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	int res = 0;
 	struct ast_config *cfg;
@@ -667,4 +667,4 @@
 {
 	return ASTERISK_GPL_KEY;
 }
-STD_MOD(MOD_1, NULL, NULL, NULL);
+STD_MOD(MOD_1, reload, NULL, NULL);