From 472c1ca2827e9409abacce4dc281b6392fb3448e Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 7 Jun 2006 18:54:56 +0000 Subject: simplify autoconfig include mechanism (make tholo happy he can use lint again :-) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32846 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_agent.c | 8 ++++---- channels/chan_alsa.c | 8 ++++---- channels/chan_features.c | 8 ++++---- channels/chan_h323.c | 19 ++++++++++++++---- channels/chan_iax2.c | 8 ++++---- channels/chan_jingle.c | 6 +++--- channels/chan_local.c | 8 ++++---- channels/chan_mgcp.c | 8 ++++---- channels/chan_misdn.c | 50 +++++++++++++++++++++++++---------------------- channels/chan_nbs.c | 8 ++++---- channels/chan_oss.c | 16 +++++++-------- channels/chan_phone.c | 8 ++++---- channels/chan_sip.c | 8 ++++---- channels/chan_skinny.c | 8 ++++---- channels/chan_vpb.c | 6 +++--- channels/chan_zap.c | 10 +++++----- channels/iax2-parser.c | 8 ++++---- channels/iax2-provision.c | 8 ++++---- channels/misdn_config.c | 18 ++++++++++------- 19 files changed, 119 insertions(+), 102 deletions(-) (limited to 'channels') diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 94c9cc64c..6bbc89cb3 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -31,6 +31,10 @@ * \ingroup channel_drivers */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -43,10 +47,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 656607534..5c921b918 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -31,6 +31,10 @@ asound ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -44,10 +48,6 @@ #define ALSA_PCM_NEW_SW_PARAMS_API #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/frame.h" #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/channels/chan_features.c b/channels/chan_features.c index a9b24dc36..8b1fe4f86 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -27,6 +27,10 @@ * \ingroup channel_drivers */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -39,10 +43,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_h323.c b/channels/chan_h323.c index a252f4e64..36c0582b8 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -37,6 +37,18 @@ h323 ***/ +#ifdef __cplusplus +extern "C" { +#endif + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#ifdef __cplusplus +} +#endif + #include #include #include @@ -57,14 +69,11 @@ #include #include #include + #ifdef __cplusplus extern "C" { #endif -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -84,9 +93,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/causes.h" #include "asterisk/stringfields.h" #include "asterisk/abstract_jb.h" + #ifdef __cplusplus } #endif + #include "h323/chan_h323.h" send_digit_cb on_send_digit; diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 727d0146f..6e684e43e 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -28,6 +28,10 @@ * \ingroup channel_drivers */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -50,8 +54,6 @@ #include #include -#include "asterisk.h" - #ifdef HAVE_ZAPTEL #include #ifdef __linux__ @@ -61,8 +63,6 @@ #endif /* __linux__ */ #endif -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/channel.h" diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 3caa2dfe5..14e33550c 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -29,6 +29,9 @@ iksemel ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include @@ -44,9 +47,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_local.c b/channels/chan_local.c index 7ea712f0b..10c96192b 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -25,6 +25,10 @@ * \ingroup channel_drivers */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -37,10 +41,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 3a4902159..9d9499fe6 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -70,6 +70,10 @@ -- fixed reload_config() / do_monitor to stay responsive during reloads */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -88,10 +92,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 3eff6a351..4c7c9843d 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -26,6 +26,10 @@ * \ingroup channel_drivers */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -39,29 +43,29 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/io.h" +#include "asterisk/frame.h" +#include "asterisk/translate.h" +#include "asterisk/cli.h" +#include "asterisk/musiconhold.h" +#include "asterisk/dsp.h" +#include "asterisk/translate.h" +#include "asterisk/config.h" +#include "asterisk/file.h" +#include "asterisk/callerid.h" +#include "asterisk/indications.h" +#include "asterisk/app.h" +#include "asterisk/features.h" +#include "asterisk/stringfields.h" + +#include "chan_misdn_config.h" +#include "isdn_lib.h" ast_mutex_t release_lock_mutex; diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index fed8ee1ff..44c7b27a9 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -29,6 +29,10 @@ nbs ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -41,10 +45,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_oss.c b/channels/chan_oss.c index ef6da80bc..98ca519de 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -36,9 +36,13 @@ ossaudio ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include -#include /* for isalnum */ -#include /* exp and log */ +#include +#include #include #include #include @@ -47,7 +51,6 @@ #include #include - #ifdef __linux #include #elif defined(__FreeBSD__) @@ -56,20 +59,15 @@ #include #endif -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/logger.h" -#include "asterisk/callerid.h" /* for ast_callerid_split() */ +#include "asterisk/callerid.h" #include "asterisk/channel.h" #include "asterisk/module.h" #include "asterisk/options.h" #include "asterisk/pbx.h" #include "asterisk/config.h" - #include "asterisk/cli.h" #include "asterisk/utils.h" #include "asterisk/causes.h" diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 242f24461..86ad060cd 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -29,6 +29,10 @@ ixjuser ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -49,10 +53,6 @@ #endif #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c544c4176..aaebc8271 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -84,6 +84,10 @@ */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -103,10 +107,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 914297aed..de72c79bb 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -25,6 +25,10 @@ */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -42,10 +46,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c index c88765b3f..836150219 100644 --- a/channels/chan_vpb.c +++ b/channels/chan_vpb.c @@ -35,13 +35,13 @@ extern "C" { -#include -#include - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include +#include + #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/channel.h" diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 5eb6565d2..8ddb3efcc 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -34,13 +34,17 @@ * * \ingroup channel_drivers * - * \todo Decprecate the "musiconhold" configuration option post 1.4 + * \todo Deprecate the "musiconhold" configuration option post 1.4 */ /*** MODULEINFO zaptel ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #ifdef __NetBSD__ @@ -65,8 +69,6 @@ #include #include -#include "asterisk.h" - #ifdef HAVE_LIBPRI #include #ifndef PRI_KEYPAD_FACILITY_TX @@ -74,8 +76,6 @@ #endif #endif -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index 15a8a8b17..76339b096 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -23,6 +23,10 @@ * \author Mark Spencer */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -32,10 +36,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/frame.h" #include "asterisk/utils.h" #include "asterisk/unaligned.h" diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index d5e0061f9..815c2f87e 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -23,6 +23,10 @@ * \author Mark Spencer */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -33,10 +37,6 @@ #include #include -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/config.h" #include "asterisk/logger.h" #include "asterisk/cli.h" diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 58c1758bb..502436258 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -26,6 +26,10 @@ * \ingroup channel_drivers */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include #include #include @@ -33,13 +37,13 @@ #include "chan_misdn_config.h" -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/config.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/lock.h" +#include "asterisk/pbx.h" +#include "asterisk/strings.h" +#include "asterisk/utils.h" #define AST_LOAD_CFG ast_config_load #define AST_DESTROY_CFG ast_config_destroy -- cgit v1.2.3