simplify autoconfig include mechanism (make tholo happy he can use lint again :-)

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

23 files changed, 90 insertions, 87 deletions

diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index 3353078fa..6c9c469cd 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -21,14 +21,14 @@
  * 
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 03a653579..7c2591a39 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -20,14 +20,15 @@
  * 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index 1b46ad79c..96a8f7f17 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -23,14 +23,14 @@
  * \author Anthony Minessale II 
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index dd51bb0a6..b4f1ec771 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -22,14 +22,15 @@
  * 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
@@ -38,6 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/indications.h"
 #include "asterisk/stringfields.h"
+
 #define locked_copy_string(chan, dest, source, len) \
 	do { \
 		ast_channel_lock(chan); \
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 2216e65b9..64210eb33 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -32,15 +32,15 @@
 	<depend>curl</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <curl/curl.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 4d3a85f3d..3df16de18 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -24,15 +24,15 @@
  * \ingroup functions
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/funcs/func_db.c b/funcs/func_db.c
index e35859d1a..640c07a53 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -25,15 +25,15 @@
  * \author Russell Bryant <russelb@clemson.edu>
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <regex.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 2a409ffee..94610d304 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -29,13 +29,13 @@
  * \arg See also AstENUM
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_env.c b/funcs/func_env.c
index d89927775..e7a4510c2 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -20,16 +20,16 @@
  * 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_global.c b/funcs/func_global.c
index 3fa506988..d05d88114 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -23,16 +23,16 @@
  * \author Tilghman Lesher <func_global__200605@the-tilghman.com>
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index d3bf627a5..8988ec739 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -20,15 +20,15 @@
  * 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_language.c b/funcs/func_language.c
index a3a47d5ef..2cca3772f 100644
--- a/funcs/func_language.c
+++ b/funcs/func_language.c
@@ -20,14 +20,14 @@
  * 
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index 1543a27f3..dee61e82e 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -22,14 +22,14 @@
  * \author Anthony Minessale II
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_math.c b/funcs/func_math.c
index 3ad32fdac..c5b4bff0c 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -24,15 +24,15 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index e05e0141d..d2b2ee294 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -24,14 +24,14 @@
  * \author Russell Bryant <russelb@clemson.edu>
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_moh.c b/funcs/func_moh.c
index 61c19bb4a..9230988de 100644
--- a/funcs/func_moh.c
+++ b/funcs/func_moh.c
@@ -23,12 +23,12 @@
  * \author Russell Bryant <russelb@clemson.edu> 
  */
 
-#include <stdlib.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 900e99aef..1bfbe36a5 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -28,16 +28,16 @@
 	<depend>unixodbc</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 2c0818b3d..73da134ae 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -23,15 +23,15 @@
  * \author Tilghman Lesher ( http://asterisk.drunkcoder.com/ )
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index bf61e41c2..8952311d6 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -24,16 +24,16 @@
  * \ingroup functions
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index 8a9fabfd0..65f5d6fbe 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -22,14 +22,14 @@
  * \author Claude Patry <cpatry@gmail.com>
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 16c9962c7..dff1779c4 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -24,16 +24,16 @@
  * \author Anothony Minessale II 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <regex.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index e1133865e..116aef802 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -23,15 +23,15 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index dbef5608d..8d4979b3b 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -27,15 +27,15 @@
  * 
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"