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

1 files changed, 8 insertions, 15 deletions

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 3edd4463f..4d31969dc 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -4342,7 +4342,7 @@ static void delete_devices(void)
 	ast_mutex_unlock(&devicelock);
 }
 
-static int reload(void *mod)
+static int reload(void)
 {
 	delete_devices();
 	reload_config();
@@ -4350,8 +4350,7 @@ static int reload(void *mod)
 	return 0;
 }
 
-
-static int load_module(void *mod)
+static int load_module(void)
 {
 	int res = 0;
 
@@ -4389,7 +4388,7 @@ static int load_module(void *mod)
 	return res;
 }
 
-static int unload_module(void *mod)
+static int unload_module(void)
 {
 #if 0
 	struct skinnysession *s;
@@ -4443,14 +4442,8 @@ static int unload_module(void *mod)
 	return -1;
 }
 
-static const char *key(void)
-{
-	return ASTERISK_GPL_KEY;
-}
-
-static const char *description(void)
-{
-	return "Skinny Client Control Protocol (Skinny)";
-}
-
-STD_MOD(MOD_1, reload, NULL, NULL);
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",
+		.load = load_module,
+		.unload = unload_module,
+		.reload = reload,
+	       );