path: root/funcs/func_timeout.c
diff options
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-14 14:08:19 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-14 14:08:19 +0000
commit3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch)
treeb68f48482e463e9c31126b2e3e24fca1dd2f6c82 /funcs/func_timeout.c
parentf9d382fc079246930a99640d7835d6ae3e4149db (diff)
This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h, modules are now expected to return all of their methods and flags into a structure 'mod_data', and are normally loaded with RTLD_NOW | RTLD_LOCAL, so symbols are resolved immediately and conflicts should be less likely. Only in a small number of cases (res_*, typically) modules are loaded RTLD_GLOBAL, so they can export symbols. The core of the change is only the two files loader.c and include/asterisk/module.h, all the rest is simply adaptation of the existing modules to the new API, a rather mechanical (but believe me, time and finger-consuming!) process whose detail you can figure out by svn diff'ing any single module. Expect some minor compilation issue after this change, please report it on mantis http://bugs.digium.com/view.php?id=6968 so we collect all the feedback in one place. I am just sorry that this change missed SVN version number 20000! git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_timeout.c')
1 files changed, 5 insertions, 8 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 75b328e80..e1133865e 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -175,27 +175,24 @@ static struct ast_custom_function timeout_function = {
static char *tdesc = "Channel timeout dialplan functions";
-int unload_module(void)
+static int unload_module(void *mod)
return ast_custom_function_unregister(&timeout_function);
-int load_module(void)
+static int load_module(void *mod)
return ast_custom_function_register(&timeout_function);
-const char *description(void)
+static const char *description(void)
return tdesc;
-int usecount(void)
- return 0;
-const char *key()
+static const char *key(void)