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, 3 insertions, 13 deletions

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index eb40500dd..c4714a09d 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -477,12 +477,12 @@ static void *scan_thread(void *unused)
 	return NULL;
 }
 
-static int unload_module(void *mod)
+static int unload_module(void)
 {
 	return -1;
 }
 
-static int load_module(void *mod)
+static int load_module(void)
 {
 	pthread_t thread;
 	pthread_attr_t attr;
@@ -502,14 +502,4 @@ static int load_module(void *mod)
 	return 0;
 }
 
-static const char *description(void)
-{
-	return "Outgoing Spool Support";
-}
-
-static const char *key(void)
-{
-	return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Outgoing Spool Support");