diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
commit | e43bc6634dc60ca897a848ca3301f52c74330279 (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /funcs/func_moh.c | |
parent | 33a3a7375a4917455495c08c8602bfe453580fd1 (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: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_moh.c')
-rw-r--r-- | funcs/func_moh.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/funcs/func_moh.c b/funcs/func_moh.c index 029b715df..61c19bb4a 100644 --- a/funcs/func_moh.c +++ b/funcs/func_moh.c @@ -74,27 +74,24 @@ static struct ast_custom_function moh_function = { static char *tdesc = "Music-on-hold dialplan function"; -int unload_module(void) +static int unload_module(void *mod) { return ast_custom_function_unregister(&moh_function); } -int load_module(void) +static int load_module(void *mod) { return ast_custom_function_register(&moh_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) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1 | NO_USECOUNT, NULL, NULL, NULL); |