aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-21 02:11:39 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-21 02:11:39 +0000
commit8b0c007ad990aa27d9868da49215fd1076ac77cc (patch)
tree270b9c46c1e644483d6d2a35b509f43218ba3252 /channels/chan_zap.c
parenta42edc84034f91932a3e12d503e07f76a6eb498a (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 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f8a81e931..27714f9c5 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10212,7 +10212,7 @@ static int __unload_module(void)
return 0;
}
-static int unload_module(void *mod)
+static int unload_module(void)
{
#ifdef HAVE_PRI
int y;
@@ -11064,7 +11064,7 @@ static int setup_zap(int reload)
return 0;
}
-static int load_module(void *mod)
+static int load_module(void)
{
int res;
@@ -11210,7 +11210,7 @@ static int zt_sendtext(struct ast_channel *c, const char *text)
}
-static int reload(void *mod)
+static int reload(void)
{
int res = 0;
@@ -11222,20 +11222,14 @@ static int reload(void *mod)
return 0;
}
-static const char *description(void)
-{
- return "Zapata Telephony"
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Zapata Telephony"
#ifdef ZAPATA_PRI
" w/PRI"
#endif
- ;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1, reload, NULL, NULL);
+ ,
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );