From 8b0c007ad990aa27d9868da49215fd1076ac77cc Mon Sep 17 00:00:00 2001 From: kpfleming Date: Mon, 21 Aug 2006 02:11:39 +0000 Subject: merge new_loader_completion branch, including (at least): - restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_odbc.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'res/res_odbc.c') diff --git a/res/res_odbc.c b/res/res_odbc.c index b597b2339..3d927b9a3 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -513,9 +513,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj) return ODBC_SUCCESS; } -LOCAL_USER_DECL; - -static int reload(void *mod) +static int reload(void) { static char *cfg = "res_odbc.conf"; struct ast_config *config; @@ -658,13 +656,13 @@ static int reload(void *mod) return 0; } -static int unload_module(void *mod) +static int unload_module(void) { /* Prohibit unloading */ return -1; } -static int load_module(void *mod) +static int load_module(void) { load_odbc_config(); ast_cli_register(&odbc_show_struct); @@ -672,14 +670,8 @@ static int load_module(void *mod) return 0; } -static const char *description(void) -{ - return "ODBC Resource"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0, reload, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ODBC Resource", + .load = load_module, + .unload = unload_module, + .reload = reload, + ); -- cgit v1.2.3