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_indications.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'res/res_indications.c') diff --git a/res/res_indications.c b/res/res_indications.c index 3e248a1b4..18e79e2de 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -363,7 +363,7 @@ static struct ast_cli_entry show_indications_cli = /* * Standard module functions ... */ -static int unload_module(void *mod) +static int unload_module(void) { /* remove the registed indications... */ ast_unregister_indication_country(NULL); @@ -378,7 +378,7 @@ static int unload_module(void *mod) } -static int load_module(void *mod) +static int load_module(void) { if (ind_load_module()) return -1; @@ -392,7 +392,7 @@ static int load_module(void *mod) return 0; } -static int reload(void *mod) +static int reload(void) { /* remove the registed indications... */ ast_unregister_indication_country(NULL); @@ -400,14 +400,8 @@ static int reload(void *mod) return ind_load_module(); } -static const char *description(void) -{ - return "Indications Configuration"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0 | NO_USECOUNT, reload, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Indications Resource", + .load = load_module, + .unload = unload_module, + .reload = reload, + ); -- cgit v1.2.3