summaryrefslogtreecommitdiff
path: root/channels/chan_features.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:11:39 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:11:39 +0000
commit0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch)
tree270b9c46c1e644483d6d2a35b509f43218ba3252 /channels/chan_features.c
parentf60ada0be22cd646454278e102d384a5dbaf7d59 (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: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_features.c')
-rw-r--r--channels/chan_features.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 8b1fe4f86..d1feadbea 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -519,7 +519,7 @@ static struct ast_cli_entry cli_show_features = {
{ "feature", "show", "channels", NULL }, features_show,
"Show status of feature channels", show_features_usage, NULL };
-static int load_module(void *mod)
+static int load_module(void)
{
/* Make sure we can register our sip channel type */
if (ast_channel_register(&features_tech)) {
@@ -530,7 +530,7 @@ static int load_module(void *mod)
return 0;
}
-static int unload_module(void *mod)
+static int unload_module(void)
{
struct feature_pvt *p;
@@ -553,15 +553,5 @@ static int unload_module(void *mod)
return 0;
}
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-static const char *description(void)
-{
- return "Feature Proxy Channel";
-}
-
-STD_MOD(MOD_1, NULL, NULL, NULL);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Feature Proxy Channel");