diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
| commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /pbx/pbx_config.c | |
| parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) | |
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
Diffstat (limited to 'pbx/pbx_config.c')
| -rw-r--r-- | pbx/pbx_config.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index c74c4c105..6d612eff9 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1314,7 +1314,7 @@ static struct ast_cli_entry reload_extensions_cli = /*! * Standard module functions ... */ -static int unload_module(void *mod) +static int unload_module(void) { ast_cli_unregister(&context_add_extension_cli); if (static_config && !write_protect_config) @@ -1501,7 +1501,7 @@ static int pbx_load_module(void) return 0; } -static int load_module(void *mod) +static int load_module(void) { if (pbx_load_module()) return -1; @@ -1519,7 +1519,7 @@ static int load_module(void *mod) return 0; } -static int reload(void *mod) +static int reload(void) { if (clearglobalvars_config) pbx_builtin_clear_globals(); @@ -1527,15 +1527,8 @@ static int reload(void *mod) return 0; } -static const char *description(void) -{ - return "Text Extension Configuration"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -/* XXX really no usecount ? */ -STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration", + .load = load_module, + .unload = unload_module, + .reload = reload, + ); |