build function modules independently (no more pbx_functions.so)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9469 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 34 insertions, 9 deletions

diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 6352b58b3..547159efe 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -30,8 +30,9 @@
 
 #include "asterisk.h"
 
-/* ASTERISK_FILE_VERSION(__FILE__, "$Revision$") */
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/logger.h"
@@ -39,7 +40,7 @@
 #include "asterisk/app.h"
 #include "asterisk/options.h"
 
-static char *builtin_function_timeout_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) 
+static char *timeout_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) 
 {
 	time_t myt;
 
@@ -81,7 +82,7 @@ static char *builtin_function_timeout_read(struct ast_channel *chan, char *cmd,
 	return buf;
 }
 
-static void builtin_function_timeout_write(struct ast_channel *chan, char *cmd, char *data, const char *value) 
+static void timeout_write(struct ast_channel *chan, char *cmd, char *data, const char *value) 
 {
 	int x;
 	char timestr[64];
@@ -135,10 +136,7 @@ static void builtin_function_timeout_write(struct ast_channel *chan, char *cmd,
 	}
 }
 
-#ifndef BUILTIN_FUNC
-static
-#endif
-struct ast_custom_function timeout_function = {
+static struct ast_custom_function timeout_function = {
 	.name = "TIMEOUT",
 	.synopsis = "Gets or sets timeouts on the channel.",
 	.syntax = "TIMEOUT(timeouttype)",
@@ -165,10 +163,37 @@ struct ast_custom_function timeout_function = {
 	"	   extension in this amount of time, control will pass to the\n"
 	"	   't' extension if it exists, and if not the call would be\n"
 	"	   terminated.  The default timeout is 10 seconds.\n",
-	.read = builtin_function_timeout_read,
-	.write = builtin_function_timeout_write,
+	.read = timeout_read,
+	.write = timeout_write,
 };
 
+static char *tdesc = "Channel timeout dialplan functions";
+
+int unload_module(void)
+{
+        return ast_custom_function_unregister(&timeout_function);
+}
+
+int load_module(void)
+{
+        return ast_custom_function_register(&timeout_function);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	return 0;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
+
 /*
 Local Variables:
 mode: C