From 0595b5e2aa6a868b01c617881cfefc6028817a28 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Mon, 19 Nov 2007 18:52:04 +0000 Subject: [PATCH] include "logger.h" and errno.h from asterisk.h - usage shows that they were included almost everywhere. Remove some of the instances. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89424 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_adsiprog.c | 2 -- apps/app_alarmreceiver.c | 1 - apps/app_authenticate.c | 3 --- apps/app_chanisavail.c | 2 -- apps/app_channelredirect.c | 1 - apps/app_chanspy.c | 1 - apps/app_controlplayback.c | 1 - apps/app_db.c | 1 - apps/app_dial.c | 2 -- apps/app_dictate.c | 1 - apps/app_directed_pickup.c | 1 - apps/app_directory.c | 1 - apps/app_disa.c | 1 - apps/app_dumpchan.c | 1 - apps/app_echo.c | 1 - apps/app_exec.c | 1 - apps/app_externalivr.c | 1 - apps/app_festival.c | 1 - apps/app_flash.c | 2 -- apps/app_followme.c | 1 - apps/app_forkcdr.c | 1 - apps/app_getcpeid.c | 1 - apps/app_ices.c | 2 -- apps/app_image.c | 1 - apps/app_ivrdemo.c | 1 - apps/app_macro.c | 1 - apps/app_meetme.c | 1 - apps/app_milliwatt.c | 1 - apps/app_minivm.c | 2 -- apps/app_mixmonitor.c | 1 - apps/app_morsecode.c | 1 - apps/app_mp3.c | 1 - apps/app_nbscat.c | 1 - apps/app_osplookup.c | 2 -- apps/app_page.c | 3 --- apps/app_parkandannounce.c | 1 - apps/app_playback.c | 1 - apps/app_privacy.c | 1 - apps/app_queue.c | 2 -- apps/app_read.c | 1 - apps/app_readexten.c | 1 - apps/app_readfile.c | 1 - apps/app_record.c | 1 - apps/app_rpt.c | 2 -- apps/app_sayunixtime.c | 1 - apps/app_senddtmf.c | 1 - apps/app_sendtext.c | 1 - apps/app_setcallerid.c | 1 - apps/app_skel.c | 1 - apps/app_sms.c | 2 -- apps/app_softhangup.c | 1 - apps/app_speech_utils.c | 1 - apps/app_stack.c | 1 - apps/app_system.c | 1 - apps/app_talkdetect.c | 1 - apps/app_test.c | 1 - apps/app_transfer.c | 1 - apps/app_url.c | 1 - apps/app_userevent.c | 1 - apps/app_verbose.c | 1 - apps/app_voicemail.c | 2 -- apps/app_waitforring.c | 1 - apps/app_waitforsilence.c | 1 - apps/app_while.c | 1 - apps/app_zapateller.c | 1 - apps/app_zapbarge.c | 1 - apps/app_zapras.c | 2 -- apps/app_zapscan.c | 3 --- channels/chan_agent.c | 2 -- channels/chan_alsa.c | 2 -- channels/chan_features.c | 2 -- channels/chan_gtalk.c | 2 -- channels/chan_h323.c | 2 -- channels/chan_iax2.c | 2 -- channels/chan_jingle.c | 2 -- channels/chan_local.c | 2 -- channels/chan_mgcp.c | 2 -- channels/chan_misdn.c | 2 -- channels/chan_nbs.c | 2 -- channels/chan_oss.c | 2 -- channels/chan_phone.c | 2 -- channels/chan_sip.c | 2 -- channels/chan_skinny.c | 2 -- channels/chan_unistim.c | 2 -- channels/chan_usbradio.c | 2 -- channels/chan_vpb.cc | 1 - channels/chan_zap.c | 2 -- channels/iax2-provision.c | 1 - channels/misdn_config.c | 1 - codecs/codec_a_mu.c | 1 - codecs/codec_adpcm.c | 1 - codecs/codec_alaw.c | 1 - codecs/codec_g722.c | 1 - codecs/codec_g726.c | 1 - codecs/codec_gsm.c | 1 - codecs/codec_ilbc.c | 1 - codecs/codec_lpc10.c | 1 - codecs/codec_speex.c | 1 - codecs/codec_ulaw.c | 1 - codecs/codec_zap.c | 2 -- formats/format_g723.c | 2 -- formats/format_g726.c | 2 -- formats/format_g729.c | 1 - formats/format_gsm.c | 2 -- formats/format_h263.c | 2 -- formats/format_h264.c | 2 -- formats/format_ilbc.c | 2 -- formats/format_jpeg.c | 2 -- formats/format_ogg_vorbis.c | 2 -- formats/format_pcm.c | 3 --- formats/format_sln.c | 2 -- formats/format_vox.c | 2 -- formats/format_wav.c | 2 -- formats/format_wav_gsm.c | 2 -- include/asterisk.h | 1 + include/asterisk/compat.h | 2 ++ main/logger.c | 5 +++++ res/res_adsi.c | 2 -- res/res_ael_share.c | 1 - res/res_agi.c | 2 -- res/res_clioriginate.c | 1 - res/res_config_odbc.c | 1 - res/res_config_pgsql.c | 1 - res/res_config_sqlite.c | 1 - res/res_convert.c | 1 - res/res_crypto.c | 2 -- res/res_features.c | 2 -- res/res_indications.c | 2 -- res/res_jabber.c | 1 - res/res_limit.c | 1 - res/res_monitor.c | 2 -- res/res_musiconhold.c | 2 -- res/res_odbc.c | 1 - res/res_realtime.c | 1 - res/res_smdi.c | 2 -- res/res_snmp.c | 1 - 136 files changed, 8 insertions(+), 192 deletions(-) diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 75cb3ae090..d2e288d477 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -35,10 +35,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index 6c7a0a41fb..3da5027090 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 0409257381..11d699d032 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -29,11 +29,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index 2cf79138dc..4a8b9bf284 100644 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c index c446d277bb..a092690b5e 100644 --- a/apps/app_channelredirect.c +++ b/apps/app_channelredirect.c @@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 4061ac91df..37cb3e5fd3 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/audiohook.h" #include "asterisk/features.h" diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index dc3e112fcb..626d6b5fcf 100644 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/app.h" diff --git a/apps/app_db.c b/apps/app_db.c index 8113908297..faf28c0d20 100644 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_dial.c b/apps/app_dial.c index 00fe86bc34..dfaa6822da 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -37,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/apps/app_dictate.c b/apps/app_dictate.c index db518788fe..a5e27c7eba 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 390e5b01a1..b823f58162 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_directory.c b/apps/app_directory.c index d316f1a6a1..df8f83c6c6 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_disa.c b/apps/app_disa.c index cffca0ff03..9ca3ae8670 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/app.h" #include "asterisk/indications.h" diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index 768f3e2db1..1f5425ebb7 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_echo.c b/apps/app_echo.c index 44e6f09819..cebd468c68 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_exec.c b/apps/app_exec.c index 3513b3b2af..69eb458e01 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index 3774c8ad87..c28432be80 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_festival.c b/apps/app_festival.c index 5b2f85cd09..9e1edbdb87 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_flash.c b/apps/app_flash.c index d1d33ebf30..37965fe501 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -33,12 +33,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include "asterisk/zapata.h" #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_followme.c b/apps/app_followme.c index dee42c2be6..57f440b311 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index cc1872c7ab..c74de67b73 100644 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/cdr.h" diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index 7cbf986f69..1eaf17a90d 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_ices.c b/apps/app_ices.c index a015b0d5bf..6f6c54b398 100644 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -34,11 +34,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/frame.h" #include "asterisk/pbx.h" diff --git a/apps/app_image.c b/apps/app_image.c index 875f2a6178..28598f5d1a 100644 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c index 2e7cb05c40..6dbbe7191e 100644 --- a/apps/app_ivrdemo.c +++ b/apps/app_ivrdemo.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_macro.c b/apps/app_macro.c index 37b7a0aeaa..f35e9e51e9 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0587d73795..cb16bbf665 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 63ce6f9f63..ee5bfda469 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_minivm.c b/apps/app_minivm.c index d2c2abe6df..a33415fe8e 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -145,7 +145,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -158,7 +157,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/astobj.h" #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index c30a737cda..775c4fc687 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/audiohook.h" #include "asterisk/pbx.h" diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c index 08a4ec844d..e9b7aab22c 100644 --- a/apps/app_morsecode.c +++ b/apps/app_morsecode.c @@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 3243713a79..6404276b99 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/frame.h" #include "asterisk/pbx.h" diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index e076dea84b..4c212564f6 100644 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/frame.h" #include "asterisk/pbx.h" diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 13e43ea959..39027f493a 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include @@ -51,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "asterisk/options.h" #include "asterisk/cli.h" -#include "asterisk/logger.h" #include "asterisk/astosp.h" /* OSP Buffer Sizes */ diff --git a/apps/app_page.c b/apps/app_page.c index e2e7472a1d..5702735b3e 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -34,10 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/options.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index 9ae1f2e908..fc63772a7a 100644 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_playback.c b/apps/app_playback.c index fd4b4d585a..a970e6c057 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 02bae73028..ecae9c15d9 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/utils.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/apps/app_queue.c b/apps/app_queue.c index 3ceecb72f5..2f83f70508 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -60,14 +60,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/apps/app_read.c b/apps/app_read.c index 32e9202bef..81eb95ba9f 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/app.h" diff --git a/apps/app_readexten.c b/apps/app_readexten.c index fbff8833a0..eda674b337 100644 --- a/apps/app_readexten.c +++ b/apps/app_readexten.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/app.h" diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 2ea9fb592f..82ffb3118c 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/apps/app_record.c b/apps/app_record.c index 273b702b4f..0b698be5a6 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_rpt.c b/apps/app_rpt.c index e9c9d734b7..ad4b150060 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -211,7 +211,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -225,7 +224,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/callerid.h" #include "asterisk/pbx.h" diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index 006782496c..2d084fc993 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index a1626853d0..7fd13f9c7a 100644 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index 01a2dea297..46660e4e46 100644 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 3b542fb3eb..c76b80eefc 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_skel.c b/apps/app_skel.c index 518da50731..8365b506ac 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_sms.c b/apps/app_sms.c index 5e9c7c00c0..8a986a2e9f 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -38,14 +38,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index 4c22cc27e8..7af8525604 100644 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index 1a4cf23bac..327e7922f3 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_stack.c b/apps/app_stack.c index dac03125d9..a175438a1b 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/chanvars.h" #include "asterisk/pbx.h" diff --git a/apps/app_system.c b/apps/app_system.c index 2e22b37538..fd4138e689 100644 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 48ac4dd8d2..d80af7d87f 100644 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_test.c b/apps/app_test.c index b2a8406473..3853bc3221 100644 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/options.h" #include "asterisk/module.h" -#include "asterisk/logger.h" #include "asterisk/lock.h" #include "asterisk/app.h" #include "asterisk/pbx.h" diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 1309d9d62b..b808eb415c 100644 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_url.c b/apps/app_url.c index 1d505cdddc..7d0eb00d76 100644 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 44bf2e0bff..851641f458 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -27,7 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 80af802847..d3719e9010 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c140a635db..0287b66579 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -65,7 +65,6 @@ c-client (http://www.washington.edu/imap/ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -89,7 +88,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index e66a941829..76717444c9 100644 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index 265d4639e0..1984a5abaf 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/dsp.h" diff --git a/apps/app_while.c b/apps/app_while.c index bb3956a1fa..ed6c0615af 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/utils.h" #include "asterisk/config.h" diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index c3467e1c74..74c458c557 100644 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 2c321b6927..663c7b1103 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_zapras.c b/apps/app_zapras.c index a15f0c2b2c..4af24231ee 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -41,14 +41,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #endif /* __linux__ */ -#include #include #include "asterisk/zapata.h" #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index 95721b871f..27f3a3ec7c 100644 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -38,13 +38,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - #include "asterisk/zapata.h" #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/channels/chan_agent.c b/channels/chan_agent.c index cc202a585b..b5e195c98b 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -46,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 282dd0cf4b..484270ec71 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include #include #include @@ -45,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/frame.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/module.h" #include "asterisk/options.h" diff --git a/channels/chan_features.c b/channels/chan_features.c index 4545b1b62f..f16c87a8f8 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -34,14 +34,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 5ebc5853c8..e28684e1bd 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include #include #include #include @@ -48,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 7e1bb06779..ad3b4e5042 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -60,7 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #ifdef __cplusplus @@ -68,7 +67,6 @@ extern "C" { #endif #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/config.h" #include "asterisk/module.h" diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c50ac13964..42b8997147 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -59,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/channel.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/sched.h" diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 6f52731ebb..f8072fd540 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include #include #include #include @@ -50,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_local.c b/channels/chan_local.c index 789cf54b3d..c6b5638ff3 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -29,14 +29,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 7bc1c26d5a..be9b2f0465 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -49,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 75b9a2e1a8..36cf5beba7 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -51,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 1712942d48..86a042c0e9 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include #include #include #include @@ -44,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_oss.c b/channels/chan_oss.c index cc65f47387..8f3e084bbe 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #ifdef __linux #include @@ -57,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/frame.h" -#include "asterisk/logger.h" #include "asterisk/callerid.h" #include "asterisk/channel.h" #include "asterisk/module.h" diff --git a/channels/chan_phone.c b/channels/chan_phone.c index faec92c4d2..f468a98685 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -52,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 106368caf8..28f23d64aa 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -89,7 +89,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include #include #include #include @@ -100,7 +99,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index d8d2694169..4014d742aa 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -46,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index c39bcd22b9..7cd9aab466 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include @@ -54,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index 47952c5607..6c9da96605 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include @@ -101,7 +100,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/frame.h" -#include "asterisk/logger.h" #include "asterisk/callerid.h" #include "asterisk/channel.h" #include "asterisk/module.h" diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index bf4ef0ff77..e6f808cdb2 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 9b9f7e92b2..633d7b9bdd 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #else #include #endif -#include #include #include #include @@ -73,7 +72,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index 5c0f932409..5a06a8f9b7 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/cli.h" #include "asterisk/lock.h" #include "asterisk/frame.h" diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 2bd7ef9a8a..b6a01ec067 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/config.h" #include "asterisk/channel.h" -#include "asterisk/logger.h" #include "asterisk/lock.h" #include "asterisk/pbx.h" #include "asterisk/strings.h" diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index 8cf89b68a3..8142178963 100644 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/translate.h" #include "asterisk/channel.h" diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index c63544b773..17605cd146 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" #include "asterisk/config.h" diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index c7a85feb26..2b4ff37315 100644 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/config.h" #include "asterisk/options.h" diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 38014dabe7..00cb55a6f5 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" #include "asterisk/config.h" diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index 9ef79add71..6423a71870 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" #include "asterisk/config.h" diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index 99b5322d04..817cb3bcbd 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/config.h" #include "asterisk/options.h" #include "asterisk/module.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/utils.h" diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index 5caec75f53..3354dde003 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/module.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/utils.h" diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index bee74ddf9a..9048957a1c 100644 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/config.h" #include "asterisk/options.h" #include "asterisk/module.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/utils.h" diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index 2053490566..2113b9b886 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/config.h" #include "asterisk/options.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/utils.h" diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 47c0b8a939..5c5206fbb2 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/config.h" #include "asterisk/options.h" diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c index 31c84438a2..e3994cd58c 100644 --- a/codecs/codec_zap.c +++ b/codecs/codec_zap.c @@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include @@ -48,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" #include "asterisk/module.h" #include "asterisk/cli.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/utils.h" #include "asterisk/linkedlists.h" diff --git a/formats/format_g723.c b/formats/format_g723.c index 9a9f1af30a..211f6d4f09 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -31,13 +31,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include #include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" diff --git a/formats/format_g726.c b/formats/format_g726.c index 93e3dc873e..259662531c 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -35,13 +35,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/options.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_g729.c b/formats/format_g729.c index 003d93473f..5f8cb60b75 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 55c65b11b6..b2559054a6 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -30,12 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_h263.c b/formats/format_h263.c index 09e4d3c4ed..d233a03706 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_h264.c b/formats/format_h264.c index 05b2624e71..e4feaf41af 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index 35278e0b63..f54b64cd29 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -32,12 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index 8c4c4e3371..dd875d66f5 100644 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -31,11 +31,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/image.h" diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index da0ec0ea0e..b34421ccbf 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include @@ -50,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/options.h" diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 05fd02fe6f..df5b415067 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -30,13 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -// #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_sln.c b/formats/format_sln.c index 3fe406da3c..609520a089 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -29,12 +29,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_vox.c b/formats/format_vox.c index 4460b21ea5..ffbf240902 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_wav.c b/formats/format_wav.c index 2abddc2194..7d8ccc30c5 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 36a6d4b634..727e377c80 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -34,12 +34,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/sched.h" #include "asterisk/module.h" #include "asterisk/endian.h" diff --git a/include/asterisk.h b/include/asterisk.h index 9881711e11..d4b2f03917 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -30,6 +30,7 @@ #include "asterisk/compat.h" #include "asterisk/paths.h" +#include "asterisk/logger.h" /* Default to allowing the umask or filesystem ACLs to determine actual file * creation permissions diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 25476bc47d..d918cd7075 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -117,6 +117,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz); #endif +#include + #ifdef SOLARIS #define __BEGIN_DECLS #define __END_DECLS diff --git a/main/logger.c b/main/logger.c index 457c2bd07c..d1c5b476af 100644 --- a/main/logger.c +++ b/main/logger.c @@ -25,6 +25,10 @@ * \author Mark Spencer */ +/* Prevent inclusion of logger.h - it redefines LOG_* which we need + * to define syslog_level_map. Later, we force its inclusion again. + */ +#define _ASTERISK_LOGGER_H #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -55,6 +59,7 @@ static int syslog_level_map[] = { #define SYSLOG_NLEVELS sizeof(syslog_level_map) / sizeof(int) +#undef _ASTERISK_LOGGER_H /* now include logger.h */ #include "asterisk/logger.h" #include "asterisk/lock.h" #include "asterisk/options.h" diff --git a/res/res_adsi.c b/res/res_adsi.c index 5eabbd15f0..5a1cf14db9 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -36,13 +36,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include -#include #include "asterisk/adsi.h" #include "asterisk/ulaw.h" #include "asterisk/alaw.h" #include "asterisk/callerid.h" -#include "asterisk/logger.h" #include "asterisk/fskmodem.h" #include "asterisk/channel.h" #include "asterisk/module.h" diff --git a/res/res_ael_share.c b/res/res_ael_share.c index e1fd46718f..92d2d5d4f0 100644 --- a/res/res_ael_share.c +++ b/res/res_ael_share.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/options.h" #include "asterisk/pbx.h" diff --git a/res/res_agi.c b/res/res_agi.c index 55659f3cf7..d8df0791b7 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -31,13 +31,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include #include "asterisk/network.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c index 5ecf0f7823..3d20e3ca36 100644 --- a/res/res_clioriginate.c +++ b/res/res_clioriginate.c @@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); #include "asterisk/channel.h" #include "asterisk/pbx.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/cli.h" #include "asterisk/utils.h" diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 86c071cdcf..129c3cbe99 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/config.h" diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index 233fc6a694..f40d34186b 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include /* PostgreSQL */ #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/config.h" diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index ed01726318..69db445c8b 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -91,7 +91,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/cli.h" #include "asterisk/lock.h" #include "asterisk/config.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/options.h" #include "asterisk/linkedlists.h" diff --git a/res/res_convert.c b/res/res_convert.c index c4fc4a6300..0b4d664ff2 100644 --- a/res/res_convert.c +++ b/res/res_convert.c @@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/logger.h" #include "asterisk/module.h" #include "asterisk/cli.h" #include "asterisk/file.h" diff --git a/res/res_crypto.c b/res/res_crypto.c index 0b3b16ed2b..a5782f9f09 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -37,12 +37,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include #include "asterisk/file.h" #include "asterisk/channel.h" -#include "asterisk/logger.h" #include "asterisk/say.h" #include "asterisk/module.h" #include "asterisk/options.h" diff --git a/res/res_features.c b/res/res_features.c index 9d6356ae71..14550b80f3 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -28,14 +28,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include #include #include #include #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/res/res_indications.c b/res/res_indications.c index 49121084b2..a957b78282 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -29,13 +29,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include -#include #include #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/cli.h" -#include "asterisk/logger.h" #include "asterisk/config.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" diff --git a/res/res_jabber.c b/res/res_jabber.c index b9bfa6c477..57f3a25aba 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/config.h" #include "asterisk/callerid.h" #include "asterisk/lock.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/cli.h" #include "asterisk/app.h" diff --git a/res/res_limit.c b/res/res_limit.c index b8cc175d0b..28a5e13235 100644 --- a/res/res_limit.c +++ b/res/res_limit.c @@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #include #include -#include #include "asterisk/module.h" #include "asterisk/cli.h" diff --git a/res/res_monitor.c b/res/res_monitor.c index e3698167e2..4a401a411d 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -27,13 +27,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include "asterisk/lock.h" #include "asterisk/channel.h" -#include "asterisk/logger.h" #include "asterisk/file.h" #include "asterisk/pbx.h" #include "asterisk/module.h" diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index dc42b67903..d82a65770a 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -51,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" diff --git a/res/res_odbc.c b/res/res_odbc.c index b458d602d4..fcde0f7cfd 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/config.h" #include "asterisk/options.h" diff --git a/res/res_realtime.c b/res/res_realtime.c index 0576579997..7d42dda2f1 100644 --- a/res/res_realtime.c +++ b/res/res_realtime.c @@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/file.h" -#include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/options.h" #include "asterisk/pbx.h" diff --git a/res/res_smdi.c b/res/res_smdi.c index c785f2339b..376ccc052b 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -26,7 +26,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include #include #include #include @@ -39,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/config.h" #include "asterisk/astobj.h" #include "asterisk/io.h" -#include "asterisk/logger.h" #include "asterisk/options.h" /* Message expiry time in milliseconds */ diff --git a/res/res_snmp.c b/res/res_snmp.c index 1fac2c31e6..eafc53c918 100644 --- a/res/res_snmp.c +++ b/res/res_snmp.c @@ -27,7 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/module.h" -#include "asterisk/logger.h" #include "asterisk/options.h" #include "snmp/agent.h"