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

1 files changed, 8 insertions, 16 deletions

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 3ea531957..b380c1b40 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -49,8 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/res_odbc.h"
 #include "asterisk/app.h"
 
-static char *tdesc = "ODBC lookups";
-
 static char *config = "func_odbc.conf";
 
 enum {
@@ -533,7 +531,7 @@ static int odbc_unload_module(void)
 	return 0;
 }
 
-static int reload(void *mod)
+static int reload(void)
 {
 	int res = 0;
 	struct ast_config *cfg;
@@ -573,27 +571,21 @@ reload_out:
 	return res;
 }
 
-static int unload_module(void *mod)
+static int unload_module(void)
 {
 	return odbc_unload_module();
 }
 
-static int load_module(void *mod)
+static int load_module(void)
 {
 	return odbc_load_module();
 }
 
-static const char *description(void)
-{
-	return tdesc;
-}
-
 /* XXX need to revise usecount - set if query_lock is set */
 
-static const char *key(void)
-{
-	return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1, reload, NULL, NULL);
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC lookups",
+		.load = load_module,
+		.unload = unload_module,
+		.reload = reload,
+	       );