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 /res | |
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 'res')
-rw-r--r-- | res/res_adsi.c | 8 | ||||
-rw-r--r-- | res/res_agi.c | 8 | ||||
-rw-r--r-- | res/res_clioriginate.c | 8 | ||||
-rw-r--r-- | res/res_config_odbc.c | 8 | ||||
-rw-r--r-- | res/res_config_pgsql.c | 8 | ||||
-rw-r--r-- | res/res_convert.c | 7 | ||||
-rw-r--r-- | res/res_crypto.c | 8 | ||||
-rw-r--r-- | res/res_features.c | 8 | ||||
-rw-r--r-- | res/res_indications.c | 8 | ||||
-rw-r--r-- | res/res_jabber.c | 7 | ||||
-rw-r--r-- | res/res_monitor.c | 10 | ||||
-rw-r--r-- | res/res_musiconhold.c | 8 | ||||
-rw-r--r-- | res/res_odbc.c | 8 | ||||
-rw-r--r-- | res/res_osp.c | 8 | ||||
-rw-r--r-- | res/res_smdi.c | 8 | ||||
-rw-r--r-- | res/res_speech.c | 8 |
16 files changed, 65 insertions, 63 deletions
diff --git a/res/res_adsi.c b/res/res_adsi.c index 42e2c19b7..6d88f0d11 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -25,6 +25,10 @@ * \author Mark Spencer <markster@digium.com> */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <time.h> #include <string.h> #include <stdio.h> @@ -33,10 +37,6 @@ #include <math.h> #include <errno.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/ulaw.h" #include "asterisk/alaw.h" #include "asterisk/callerid.h" diff --git a/res/res_agi.c b/res/res_agi.c index baae496cb..1d6cd9257 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -23,6 +23,10 @@ * \author Mark Spencer <markster@digium.com> */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <netdb.h> #include <sys/socket.h> @@ -41,10 +45,6 @@ #include <errno.h> #include <sys/wait.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c index 306975946..7303d4b67 100644 --- a/res/res_clioriginate.c +++ b/res/res_clioriginate.c @@ -24,14 +24,14 @@ * */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/logger.h" diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 0929f741c..81df46159 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -32,15 +32,15 @@ <depend>unixodbc</depend> ***/ +#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/channel.h" diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index 0cf6d4ee1..97a393893 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -26,15 +26,15 @@ <depend>pgsql</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdlib.h> #include <stdio.h> #include <string.h> #include <libpq-fe.h> /* PostgreSQL */ -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/res/res_convert.c b/res/res_convert.c index 85bc7d2da..c62aba4d5 100644 --- a/res/res_convert.c +++ b/res/res_convert.c @@ -26,13 +26,14 @@ * */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdio.h> #include <string.h> #include <stdlib.h> -#include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/channel.h" #include "asterisk/logger.h" #include "asterisk/module.h" diff --git a/res/res_crypto.c b/res/res_crypto.c index e4d7ade8b..b9b973eea 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -27,6 +27,10 @@ <depend>ssl</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <openssl/ssl.h> #include <openssl/err.h> @@ -37,10 +41,6 @@ #include <unistd.h> #include <fcntl.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/channel.h" #include "asterisk/logger.h" diff --git a/res/res_features.c b/res/res_features.c index 20dc85090..4c1daca5b 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -23,6 +23,10 @@ * \author Mark Spencer <markster@digium.com> */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <pthread.h> #include <stdlib.h> #include <errno.h> @@ -34,10 +38,6 @@ #include <sys/signal.h> #include <netinet/in.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" diff --git a/res/res_indications.c b/res/res_indications.c index f4777e3c9..3e248a1b4 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -24,6 +24,10 @@ * Load the country specific dialtones into the asterisk PBX. */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <unistd.h> #include <string.h> #include <ctype.h> @@ -33,10 +37,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/cli.h" diff --git a/res/res_jabber.c b/res/res_jabber.c index a7f3fd863..cb136bb84 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -25,13 +25,14 @@ <depend>iksemel</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdlib.h> #include <stdio.h> #include <iksemel.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/jabber.h" #include "asterisk/file.h" diff --git a/res/res_monitor.c b/res/res_monitor.c index 23a9a98af..87f2c4dc4 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -23,17 +23,17 @@ * \author Mark Spencer <markster@digium.com> */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdio.h> #include <stdlib.h> #include <errno.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#include <libgen.h> /* dirname() */ - -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include <libgen.h> #include "asterisk/lock.h" #include "asterisk/channel.h" diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 9aaebff66..46796bfe8 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -29,6 +29,10 @@ <conflict>win32</conflict> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdlib.h> #include <errno.h> #include <unistd.h> @@ -44,10 +48,6 @@ #include <unistd.h> #include <sys/ioctl.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #ifdef HAVE_ZAPTEL #ifdef __linux__ #include <linux/zaptel.h> diff --git a/res/res_odbc.c b/res/res_odbc.c index 56d110152..ca8007ce6 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -33,15 +33,15 @@ <depend>unixodbc</depend> ***/ +#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/channel.h" diff --git a/res/res_osp.c b/res/res_osp.c index 17b605fce..4a00a73aa 100644 --- a/res/res_osp.c +++ b/res/res_osp.c @@ -30,6 +30,10 @@ <depend>ssl</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <sys/types.h> #include <osp/osp.h> #include <osp/osputils.h> @@ -44,10 +48,6 @@ #include <openssl/pem.h> #include <openssl/evp.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/file.h" #include "asterisk/channel.h" #include "asterisk/logger.h" diff --git a/res/res_smdi.c b/res/res_smdi.c index bc9eae160..8e12f89c3 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -22,6 +22,10 @@ * \author Matthew A. Nicholson <mnicholson@digium.com> */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -30,10 +34,6 @@ #include <time.h> #include <ctype.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/module.h" #include "asterisk/lock.h" #include "asterisk/utils.h" diff --git a/res/res_speech.c b/res/res_speech.c index 32b15d79e..62458173e 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -23,15 +23,15 @@ * \author Joshua Colp <jcolp@digium.com> */ +#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/channel.h" #include "asterisk/module.h" #include "asterisk/lock.h" |