diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-07 18:54:56 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-07 18:54:56 +0000 |
commit | 73c525e6e2dbcf452c2e78e44a63678f2b2068ea (patch) | |
tree | f9408ad7864dc1683b929f25a692213b22442992 /pbx | |
parent | 3cd1c6869dcb5f1d85a602c7b53a33437ceb0d32 (diff) |
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
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/ael/ael.flex | 5 | ||||
-rw-r--r-- | pbx/ael/ael.tab.c | 5 | ||||
-rw-r--r-- | pbx/ael/ael.y | 6 | ||||
-rw-r--r-- | pbx/ael/ael_lex.c | 5 | ||||
-rw-r--r-- | pbx/dundi-parser.c | 8 | ||||
-rw-r--r-- | pbx/pbx_ael.c | 8 | ||||
-rw-r--r-- | pbx/pbx_config.c | 8 | ||||
-rw-r--r-- | pbx/pbx_dundi.c | 8 | ||||
-rw-r--r-- | pbx/pbx_gtkconsole.c | 8 | ||||
-rw-r--r-- | pbx/pbx_loopback.c | 8 | ||||
-rw-r--r-- | pbx/pbx_realtime.c | 8 | ||||
-rw-r--r-- | pbx/pbx_spool.c | 8 |
12 files changed, 51 insertions, 34 deletions
diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex index 82c43ec10..ad3530c98 100644 --- a/pbx/ael/ael.flex +++ b/pbx/ael/ael.flex @@ -56,11 +56,14 @@ %option bison-locations %{ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include "asterisk.h" #include "asterisk/logger.h" #include "ael/ael.tab.h" #include "asterisk/ael_structs.h" diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index 999818cff..71e0f2643 100644 --- a/pbx/ael/ael.tab.c +++ b/pbx/ael/ael.tab.c @@ -174,9 +174,14 @@ * \brief Bison Grammar description of AEL2. * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "asterisk/logger.h" #include "asterisk/ael_structs.h" diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 1b129f80b..8ce3e7711 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -21,9 +21,15 @@ * \brief Bison Grammar description of AEL2. * */ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "asterisk/logger.h" #include "asterisk/ael_structs.h" diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index 292c1d189..147f554b2 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -672,11 +672,14 @@ static yyconst flex_int16_t yy_chk[553] = * bison-locations is probably not needed. */ #line 59 "ael.flex" +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include "asterisk.h" #include "asterisk/logger.h" #include "ael/ael.tab.h" #include "asterisk/ael_structs.h" diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index 9b9d9d205..46e692d6b 100644 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -22,6 +22,10 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <sys/socket.h> #include <string.h> @@ -31,10 +35,6 @@ #include <stdlib.h> #include <stdio.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/frame.h" #include "asterisk/utils.h" #include "asterisk/dundi.h" diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 960e2b498..31c081fe8 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -22,6 +22,10 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <stdlib.h> #include <stdio.h> @@ -31,10 +35,6 @@ #include <regex.h> #include <sys/stat.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/pbx.h" #include "asterisk/config.h" #include "asterisk/module.h" diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index ae3458de0..2e26711fe 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -23,6 +23,10 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <stdlib.h> #include <stdio.h> @@ -30,10 +34,6 @@ #include <ctype.h> #include <errno.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/pbx.h" #include "asterisk/config.h" #include "asterisk/options.h" diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index f8f9e326f..b4423a432 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -26,6 +26,10 @@ <depend>zlib</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -48,10 +52,6 @@ #endif #include <zlib.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index 787bd46e3..29d5ba819 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -27,6 +27,10 @@ <defaultenabled>no</defaultenabled> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <stdlib.h> #include <fcntl.h> @@ -40,10 +44,6 @@ #include <gtk/gtk.h> #include <glib.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/pbx.h" #include "asterisk/config.h" #include "asterisk/module.h" diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index a88f20e9f..e125885f8 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -22,16 +22,16 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdlib.h> #include <stdio.h> #include <unistd.h> #include <string.h> #include <errno.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 3321eeb4e..db7da2729 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -23,16 +23,16 @@ * \arg See also: \ref AstARA */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdlib.h> #include <stdio.h> #include <unistd.h> #include <string.h> #include <errno.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index c04180a76..eb40500dd 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -22,6 +22,10 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/stat.h> #include <errno.h> #include <time.h> @@ -34,10 +38,6 @@ #include <stdio.h> #include <unistd.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" |