From 883346d64a852193fb4119d4399aa0f5a54d8ae8 Mon Sep 17 00:00:00 2001 From: rizzo Date: Fri, 16 Nov 2007 20:04:58 +0000 Subject: Start untangling header inclusion in a way that does not affect build times - tested, there is no measureable difference before and after this commit. In this change: use asterisk/compat.h to include a small set of system headers: inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h, stdlib.h, alloca.h, stdio.h Where available, the inclusion is conditional on HAVE_FOO_H as determined by autoconf. Normally, source files should not include any of the above system headers, and instead use either "asterisk.h" or "asterisk/compat.h" which does it better. For the time being I have left alone second-level directories (main/db1-ast, etc.). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89333 f38db490-d61c-443f-a65b-d21fe96a405b --- funcs/func_base64.c | 5 ----- funcs/func_blacklist.c | 4 ---- funcs/func_callerid.c | 5 ----- funcs/func_cdr.c | 5 ----- funcs/func_channel.c | 5 ----- funcs/func_curl.c | 3 --- funcs/func_cut.c | 5 ----- funcs/func_db.c | 4 ---- funcs/func_devstate.c | 2 -- funcs/func_dialgroup.c | 4 ---- funcs/func_enum.c | 3 --- funcs/func_env.c | 4 ---- funcs/func_extstate.c | 2 -- funcs/func_global.c | 4 ---- funcs/func_groupcount.c | 5 ----- funcs/func_iconv.c | 4 ---- funcs/func_lock.c | 4 ---- funcs/func_logic.c | 5 ----- funcs/func_math.c | 4 ---- funcs/func_md5.c | 5 ----- funcs/func_module.c | 4 ---- funcs/func_odbc.c | 5 ----- funcs/func_rand.c | 5 ----- funcs/func_realtime.c | 6 ------ funcs/func_sha1.c | 5 ----- funcs/func_shell.c | 5 ----- funcs/func_strings.c | 4 ---- funcs/func_timeout.c | 5 ----- funcs/func_uri.c | 5 ----- funcs/func_version.c | 5 ----- funcs/func_vmcount.c | 5 ----- funcs/func_volume.c | 2 -- 32 files changed, 138 deletions(-) (limited to 'funcs') diff --git a/funcs/func_base64.c b/funcs/func_base64.c index daabe621e..2d86d90e8 100644 --- a/funcs/func_base64.c +++ b/funcs/func_base64.c @@ -26,11 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c index 30e916d59..b0a42a4db 100644 --- a/funcs/func_blacklist.c +++ b/funcs/func_blacklist.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c index 54899352a..2c7a3fcdd 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -25,11 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 4e7baa039..5f8cf0feb 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -29,11 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 5ed03e31d..7236095a9 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -27,11 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_curl.c b/funcs/func_curl.c index 4e7b44e12..107b607a0 100644 --- a/funcs/func_curl.c +++ b/funcs/func_curl.c @@ -38,9 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include #include "asterisk/lock.h" diff --git a/funcs/func_cut.c b/funcs/func_cut.c index cf1981627..2840fceb9 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 49e52bfd0..c1da3870a 100644 --- a/funcs/func_db.c +++ b/funcs/func_db.c @@ -31,10 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c index 261dd41dd..950208be5 100644 --- a/funcs/func_devstate.c +++ b/funcs/func_devstate.c @@ -32,8 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_dialgroup.c b/funcs/func_dialgroup.c index 99ac864bc..746784ba9 100644 --- a/funcs/func_dialgroup.c +++ b/funcs/func_dialgroup.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 677698cfe..f47f62fcf 100644 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -37,9 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include - #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 fea94f20c..102414b16 100644 --- a/funcs/func_env.c +++ b/funcs/func_env.c @@ -25,10 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_extstate.c b/funcs/func_extstate.c index 69c2fe829..8866d89b9 100644 --- a/funcs/func_extstate.c +++ b/funcs/func_extstate.c @@ -30,8 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #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 39fccca10..d3a22ebb8 100644 --- a/funcs/func_global.c +++ b/funcs/func_global.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 883920112..c13674357 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -25,11 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c index 1bce3c66a..72d62b227 100644 --- a/funcs/func_iconv.c +++ b/funcs/func_iconv.c @@ -31,10 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include #include diff --git a/funcs/func_lock.c b/funcs/func_lock.c index 9985f26c5..22339969f 100644 --- a/funcs/func_lock.c +++ b/funcs/func_lock.c @@ -30,10 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include - #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" diff --git a/funcs/func_logic.c b/funcs/func_logic.c index 1ec21eb9e..bcee8ba32 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 70882d1f1..fe9a078f7 100644 --- a/funcs/func_math.c +++ b/funcs/func_math.c @@ -30,11 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include #include -#include #include "asterisk/module.h" #include "asterisk/channel.h" diff --git a/funcs/func_md5.c b/funcs/func_md5.c index 7e1785d76..8c3f55f51 100644 --- a/funcs/func_md5.c +++ b/funcs/func_md5.c @@ -30,11 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_module.c b/funcs/func_module.c index a2cb5e418..8f0521a09 100644 --- a/funcs/func_module.c +++ b/funcs/func_module.c @@ -25,10 +25,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index a2f895b2e..18869f61a 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -36,11 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_rand.c b/funcs/func_rand.c index d989b0ad6..716c80320 100644 --- a/funcs/func_rand.c +++ b/funcs/func_rand.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 bc9063fe9..c31d0e042 100644 --- a/funcs/func_realtime.c +++ b/funcs/func_realtime.c @@ -28,12 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include - #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 fa4b73fda..c6d7912a0 100644 --- a/funcs/func_sha1.c +++ b/funcs/func_sha1.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_shell.c b/funcs/func_shell.c index 3acafe25a..5d2626d1c 100644 --- a/funcs/func_shell.c +++ b/funcs/func_shell.c @@ -29,11 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 70ecc4c59..ba7075b6e 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -29,10 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include #include "asterisk/module.h" diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 58b78c167..2baea1e21 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -28,11 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #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 98fad7d5a..c8ecb7bb3 100644 --- a/funcs/func_uri.c +++ b/funcs/func_uri.c @@ -32,11 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_version.c b/funcs/func_version.c index 7c7ed3802..a42462e7e 100644 --- a/funcs/func_version.c +++ b/funcs/func_version.c @@ -26,11 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c index cde16653f..cd558d435 100644 --- a/funcs/func_vmcount.c +++ b/funcs/func_vmcount.c @@ -29,12 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include #include -#include #include "asterisk/file.h" #include "asterisk/channel.h" diff --git a/funcs/func_volume.c b/funcs/func_volume.c index aca13fd47..0ac121f15 100644 --- a/funcs/func_volume.c +++ b/funcs/func_volume.c @@ -30,8 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" -- cgit v1.2.3