From 0d933f8a058fee47c46a03eb4eddae7f73df0519 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Fri, 14 Apr 2006 18:44:24 +0000
Subject: Compatibility fixes for loader changes

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20075 f38db490-d61c-443f-a65b-d21fe96a405b
---
 cdr/cdr_odbc.c    | 23 +++++++----------------
 funcs/func_odbc.c |  4 ++--
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 3e8d89521..07aa87539 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -199,7 +199,7 @@ static int odbc_log(struct ast_cdr *cdr)
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
@@ -450,34 +450,25 @@ static int odbc_init(void)
 	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);
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 56332e970..63c58dff4 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -551,7 +551,7 @@ static int odbc_unload_module(void)
 	return 0;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	int res = 0;
 	struct ast_config *cfg;
@@ -667,4 +667,4 @@ static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
-STD_MOD(MOD_1, NULL, NULL, NULL);
+STD_MOD(MOD_1, reload, NULL, NULL);
-- 
cgit v1.2.3