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 /channels/chan_iax2.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 'channels/chan_iax2.c')
-rw-r--r-- | channels/chan_iax2.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 2809003e6..97e8b6cfa 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -98,7 +98,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "iax2.h" #include "iax2-parser.h" #include "iax2-provision.h" -#include "../jitterbuf.h" +#include "jitterbuf.h" /* Define SCHED_MULTITHREADED to run the scheduler in a special multithreaded mode. */ @@ -9050,7 +9050,7 @@ static int iax2_reload(int fd, int argc, char *argv[]) return reload_config(); } -static int reload(void *mod) +static int reload(void) { return reload_config(); } @@ -9747,7 +9747,7 @@ static int __unload_module(void) return 0; } -static int unload_module(void *mod) +static int unload_module(void) { ast_mutex_destroy(&iaxq.lock); ast_mutex_destroy(&waresl.lock); @@ -9757,7 +9757,7 @@ static int unload_module(void *mod) /*! \brief Load IAX2 module, load configuraiton ---*/ -static int load_module(void *mod) +static int load_module(void) { char *config = "iax.conf"; int res = 0; @@ -9845,14 +9845,8 @@ static int load_module(void *mod) return res; } -static const char *description(void) -{ - return "Inter Asterisk eXchange (Ver 2)"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_1, reload, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Inter Asterisk eXchange (Ver 2)", + .load = load_module, + .unload = unload_module, + .reload = reload, + ); |