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

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 75cb3ae09039a1f1d5fa91d31af6bc6ccaa41b64..d2e288d4779a8d7d8d5dcb33a968727f0910ce1a 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -35,10 +35,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <netinet/in.h>
 #include <ctype.h>
-#include <errno.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_alarmreceiver.c b/apps/app_alarmreceiver.c
index 6c7a0a41fbab89a47a1f0a9310a94e8f66ac5f53..3da50270908b3170812430caecc25f788902bff0 100644 (file)
--- 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 04092573810246f838c0ba6017ea6cf945d61105..11d699d032bfad7ab7fc2d6ec3e53f30bddaafe5 100644 (file)
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -29,11 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.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_chanisavail.c b/apps/app_chanisavail.c
index 2cf79138dc7677edb9c9e506a0ed098507c1bac9..4a8b9bf284eec439fa4454e3eb09e627109e2615 100644 (file)
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -31,12 +31,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/ioctl.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_channelredirect.c b/apps/app_channelredirect.c
index c446d277bbda658931550ed9af730c74d3e205f2..a092690b5e8ba6d029d4f5fbde4c519b7329e4d9 100644 (file)
--- 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 4061ac91df3990788abc0ac861e314f55154338d..37cb3e5fd3693f45d4c43032602f432085dfcd80 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 
 #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 dc3e112fcb9f84b7c11af53fc6acc1e3a0c61f0e..626d6b5fcffd7064ad0c1cdb8b5f7fec18823983 100644 (file)
--- 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 811390829769f7b7a404ae07b674d4b6f4e6b1ce..faf28c0d20a82974e5771c8ea33542e3364c59b2 100644 (file)
--- 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 00fe86bc34067ef47067b40d65c1b8c095cd0856..dfaa6822dadbf5a87954b0a37846e95d6c931806 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -29,7 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/stat.h>
@@ -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 db518788fec023ddb06bd9631a13e74acc4bb86c..a5e27c7eba232058016b3e506bc0f01bb76f8e92 100644 (file)
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.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_directed_pickup.c b/apps/app_directed_pickup.c
index 390e5b01a199329c28f32798d6952d0b8c78aa17..b823f58162a6de64d382c53edab350e590a8989f 100644 (file)
--- 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 d316f1a6a18d514cf94a97e5ab15cfe137b52825..df8f83c6c6bb460f2888cbf45ff59df7132cea96 100644 (file)
--- 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 cffca0ff036bd1da6d0b7dcba9dfc9ff9eb1204b..9ca3ae8670a5ada5d4ab0b568b6d0c3f67f2d6bb 100644 (file)
--- 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 768f3e2db17ba971ea9093287c4ac2430c44261e..1f5425ebb7608e8a4e0d7781bf32d292984dc27c 100644 (file)
--- 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 44e6f0981994261593bff9de7f6379fbdeccb6ee..cebd468c680d9455f0d7e98507eaa1ecd49c14a9 100644 (file)
--- 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 3513b3b2afead7a7bb59befec16f8ce8067e0d58..69eb458e0133f4d8dcc91e18e6f4265e03607448 100644 (file)
--- 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 3774c8ad87a4dd4e3afad089e5ae48f5d7611bfc..c28432be800010cf3034705e33bf38ae6117ee1d 100644 (file)
--- 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 5b2f85cd09f5cf118a6741ca1b792c3f03ac4f36..9e1edbdb87bc096547bf987b4ba12dd5e1aff526 100644 (file)
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.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_flash.c b/apps/app_flash.c
index d1d33ebf30a8dff9002abe8ba9e86db38d8cfff6..37965fe50101c6a30bdb4c3ca0be9ae8de8b34ea 100644 (file)
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -33,12 +33,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #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 dee42c2be626aedd834db4088bdf466590b5087f..57f440b3116c98e3f955096087adf2d1470e8756 100644 (file)
--- 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 cc1872c7ab3798858ecc2e910f93acc0a6ceab1a..c74de67b7381db489803ccbb50b52e76eed7d534 100644 (file)
--- 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 7cbf986f69e468a657fb4d0bc1c049f8b9af5065..1eaf17a90d706247689870297101583600c7653a 100644 (file)
--- 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 a015b0d5bf9203b3c34d6cb41107c0fbbd59412c..6f6c54b3981e05c3710f43e395adff90e3238cfa 100644 (file)
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -34,11 +34,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 875f2a617810ea9bd7ed4c639dfe10fa394800a5..28598f5d1a611d63f1867a06a77672d6f9215582 100644 (file)
--- 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 2e7cb05c40474f9a7df8dfd0dfcb4f43de2f45e6..6dbbe7191e9b2aaa706bbf825e10b273fcababe0 100644 (file)
--- 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 37b7a0aeaad6d50f55f128ea178859736d31245c..f35e9e51e91dd67ee939d684c27fe51602d828d6 100644 (file)
--- 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 0587d737950e700ec393fdfdd42d916fbf02ffb4..cb16bbf6651d924a5068265820f834fe3edc0079 100644 (file)
--- 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 63ce6f9f632466ba5ec7f3bb059f1c7100ccbd69..ee5bfda469997d6eb43c2e06ea7b2adaecbe0a60 100644 (file)
--- 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 d2c2abe6df1833ddcc15bb56c72d04e1dac783a8..a33415fe8e0ddf23a380a71d6598f1a12a992e77 100644 (file)
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -145,7 +145,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -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 c30a737cda1948e5a2e6c7fc02fe792505eb932d..775c4fc6870c5dba221515e93485af9d2bec61c8 100644 (file)
--- 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 08a4ec844d33a4122075263220052aeb22538205..e9b7aab22ca4bbd4c8c4a01c23c4adb89ac9d7ba 100644 (file)
--- 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 3243713a79c2f28a8d93ad37e6471ef87dd8c554..6404276b990d78de51903e5af7901ee3d0e20897 100644 (file)
--- 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 e076dea84b90652d246f88a3abc776d8baf58bee..4c212564f6a63afde20c885c8086ba79ef68abd6 100644 (file)
--- 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 13e43ea95922f3e3922ca2b1a35f3145e0813253..39027f493a96ebe73b0a92469f02bf59dd8e9c62 100644 (file)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -37,7 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <osp/osp.h>
 #include <osp/osputils.h>
 
@@ -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 e2e7472a1dfb67ca0f7d5a5b6e961d923e0f9a25..5702735b3e52e70ff6bc017978b79802fd61516f 100644 (file)
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -34,10 +34,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #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 9ae1f2e908d14fcde60b37213e771fce7a588e1c..fc63772a7a3d5fd97d7fd3014dd8ad3e9eeb0e41 100644 (file)
--- 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 fd4b4d585a0843ebd921be7e4cef616d1c707461..a970e6c0575a2fc74e5c6fa790270c18cefb718d 100644 (file)
--- 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 02bae73028a89f6de6ce5b0280afc84a93c88257..ecae9c15d92ebb09eedffec64a32c04789906f5d 100644 (file)
--- 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 3ceecb72f5f7724a225ffc8c2b6c7ba05329cd17..2f83f7050830fdf6172b6ea404aa5ebb7342e1ac 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -60,14 +60,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.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_read.c b/apps/app_read.c
index 32e9202beff60af2230a7d2485dceb726eb3aea4..81eb95ba9fc714953224dbffc6417ed4b2cad1d1 100644 (file)
--- 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 fbff8833a0884c9021003f967146040c5790331d..eda674b337a9d9fa99cb34957512903e8c515519 100644 (file)
--- 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 2ea9fb592f6fcbd9023d7e77553bb63fd1915a44..82ffb3118c8e2e14cd93972e25940acc99407d61 100644 (file)
--- 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 273b702b4f1670480bad0cdd2249a2fffd115972..0b698be5a6170e19114c4134b4e53f8e26868b79 100644 (file)
--- 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 e9c9d734b733c4989d1db62a724b2eec3bfc7e5c..ad4b15006032fc6e123f17f51149bbceba343466 100644 (file)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -211,7 +211,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <search.h>
 #include <sys/stat.h>
-#include <errno.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <sys/time.h>
@@ -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 006782496c6c11467c54c010cd10a87becd8cc54..2d084fc993e6fea7ae37c31788294c385c5a939d 100644 (file)
--- 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 a1626853d0c5e4d8bf5bc439b60933e4b1ae6e24..7fd13f9c7a57720d558022ace253aeb89e1e6e17 100644 (file)
--- 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 01a2dea2974290f5638332ebaf70da48a803d75f..46660e4e46383f2acd621ea4e5881effd9e50ddb 100644 (file)
--- 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 3b542fb3ebb7bb80aaeb14a2e906d4815f995bc9..c76b80eefcd3bb66cae4356f7a040356d5b17738 100644 (file)
--- 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 518da5073155b296c18c6b8e88e1bf139afaec79..8365b506ac1d500ff5844cae3865832a9ea044c3 100644 (file)
--- 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 5e9c7c00c039827a8a70af642b62a9f13c9ee339..8a986a2e9f951f1f977ed3c9e5439028c1a866d5 100644 (file)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -38,14 +38,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <sys/stat.h>
 
 #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 4c22cc27e8b38efc82e0b8819941931a0af664e8..7af8525604cbc9a343c7cd2c909785480ba36e89 100644 (file)
--- 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 1a4cf23baccd81aeaf3e79043b041e9b1568e65b..327e7922f32645b2af44d6e4ec4a2a01fdb344a6 100644 (file)
--- 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 dac03125d9b0eefce95da8626c75421a11d9f862..a175438a1b7521ddd5d66c4ee62f3c3944cbf272 100644 (file)
--- 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 2e22b375383efc83d559306e9c62d34ed28e216c..fd4138e689bad37a5d2d7c7991069a821ea9dc1f 100644 (file)
--- 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 48ac4dd8d2980b7ce8938b54915950cd12f43bc4..d80af7d87fc2be029fb3d48dcf11ea4cf342ae73 100644 (file)
--- 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 b2a84064736d93f875be0f2477f707348ad41ed0..3853bc3221a10baf6810563b54a41c832c492518 100644 (file)
--- 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 1309d9d62b1383f60d45d311fc7e09665fe83ba3..b808eb415c78c37435699bcfa7b27264d0265839 100644 (file)
--- 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 1d505cdddc310e192f9b314a3044a5ab871eaf3d..7d0eb00d76aa3359de4226733bf238e05ef1529b 100644 (file)
--- 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 44bf2e0bff76d4c1641fb501889fe5d1d0bdbdd7..851641f4586728c6855a2bc34d272f1875eb1633 100644 (file)
--- 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 80af802847998eca4d91f668553b42082261faa6..d3719e90108fa1b72793baf67749992d121c5031 100644 (file)
--- 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 c140a635db6f800d7fcccdaac8f596f3780ebdbf..0287b665793176bf4b174ad25fc488a531972781 100644 (file)
--- 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 <errno.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -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 e66a941829890e0dacafd5458badd41ca182cab2..76717444c93f941640b1d032ae5b1ed1d270148b 100644 (file)
--- 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 265d4639e08a68beeae3ba9dce8a288ac77dbf1a..1984a5abafb15f643f4622a0a36cddb2580cf543 100644 (file)
--- 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 bb3956a1face97d45b2e453a413f895bbb3a12bf..ed6c0615afc373e8b0f120993d4576ae5ddf99b1 100644 (file)
--- 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 c3467e1c7447bc668f135e4f257f3a238f0a71a8..74c458c5571bf83960a4f2d4f1e40fe235ad1e0f 100644 (file)
--- 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 2c321b69273e71ac0f16dd2a3d72a4d48f4feef1..663c7b11038ce642a5c1393d22eb6782dfe5d4c1 100644 (file)
--- 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 a15f0c2b2cebd455944e4b861520bd7466e8b605..4af24231ee537a2d35790a6f5dd90c807dfdecf7 100644 (file)
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -41,14 +41,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #endif /* __linux__ */
 
-#include <errno.h>
 #include <fcntl.h>
 
 #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 95721b871f8c4663fc2054edd6bc528c52480751..27f3a3ec7cbd6c2343aef7786d4cfff025a30a09 100644 (file)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -38,13 +38,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #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 cc202a585b140a9052ae1ddd09e2eca79755c4fb..b5e195c98b736df3d5ee65df54f21d66582da1d8 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -35,7 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <netdb.h>
@@ -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 282dd0cf4b081a851e6ee99b0032d8387008814f..484270ec7164ad93012b44def3b9e0be797ecfa5 100644 (file)
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -36,7 +36,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
@@ -45,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <alsa/asoundlib.h>
 
 #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 4545b1b62f29c14065eb6d289e52b8e11d56142c..f16c87a8f83d6f6f3fc8b2b504049b043e3a897e 100644 (file)
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -34,14 +34,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/signal.h>
 
 #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 5ebc5853c8219890a406c1f0a498e6445d566cdf..e28684e1bdefc193fe4ad66860ad2e5a574556a8 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -36,7 +36,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/socket.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -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 7e1bb06779dadef343c92509453bde81a1bbb9f7..ad3b4e50423166c04bc99b24e3d4d9db7eed2e02 100644 (file)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -60,7 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netdb.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #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 c50ac13964ca36543d07ad134b6f7d12faa356d9..42b8997147d8a079e254c4edb1fd0f37f4b864fe 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/signal.h>
 #include <signal.h>
 #include <strings.h>
-#include <errno.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -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 6f52731ebb79c4cb377d0af895188a4f8470cafa..f8072fd540c37bb5dce642dc3aeea1b6a41bcfee 100644 (file)
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -38,7 +38,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/socket.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -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 789cf54b3d7db4190bfe237379df4a621959bfc1..c6b5638ff38138ffcd06abfe7327b5aff9d158af 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -29,14 +29,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/signal.h>
 
 #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 7bc1c26d5aeac2b4706700127da80f4cab5a25fa..be9b2f0465911afe1a1dcfb1b8a536cad5af32b1 100644 (file)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
@@ -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 75b9a2e1a8aa4cf06e1582018f79e91e33ada734..36cf5beba711706b40cda863a367d1a0c49e2abd 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <pthread.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -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 1712942d48541f18e924a09bbfe64c8cb49acfdf..86a042c0e9a0bf9f28be933943ce06c778f6c039 100644 (file)
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -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 cc65f473872548fdacac01ab2acbdfcaea1a603a..8f3e084bbefa63a5c7040257a51f4d246ac48a39 100644 (file)
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #ifdef __linux
 #include <linux/soundcard.h>
@@ -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 faec92c4d20e995cf0993b2de90b56bdc0174d72..f468a98685eadde47e874994dd1b8ab3f7ebec29 100644 (file)
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -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 106368caf83e1a4abebb8179a6c3522a6669bc05..28f23d64aac637d9c91cd38a4311e54136384a68 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -89,7 +89,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/signal.h>
@@ -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 d8d269416938663c057c1374aaf91a6674ffcaee..4014d742aa5f6bedb7a09aad9d576cef6c3dd72c 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
@@ -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 c39bcd22b9fedba6fff619b2d3ecb6369cce6580..7cd9aab46631538f2895e77628fb438cecc558c9 100644 (file)
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <net/if.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
@@ -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 47952c56076320ef9016a5e6404747b3d82f412f..6c9da966059b91326bf7bc55898c44e9b55ca5a8 100644 (file)
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <usb.h>
 #include <alsa/asoundlib.h>
 
@@ -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 bf4ef0ff77f9a7e67914d1323a78eb33a82a0d1f..e6f808cdb2376fd075b0e32b249eed3b3ef1b12f 100644 (file)
--- 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 9b9f7e92b2c39e07e9eebdf998514ede69d8ffda..633d7b9bdd4940aa8ab29b581ef7baadea5b5791 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #else
 #include <sys/signal.h>
 #endif
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <math.h>
 #include <ctype.h>
@@ -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 5c0f9324091bc005d0f79de6a545f287ca026c15..5a06a8f9b74a2e1bd02adbfd584b3e28333ad51d 100644 (file)
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/socket.h>
 
 #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 2bd7ef9a8a58b7658025d2e6da255d7c177008c6..b6a01ec0674a3ef2403ab48d6fb52f9650a2d50a 100644 (file)
--- 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 8cf89b68a3e49833e3186fbadd11c8f42f9a596b..8142178963312c100c517ece21a2bd6292ffe4fa 100644 (file)
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #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 c63544b77385422177fbb8ed118e46259fa62f62..17605cd14669123d8680031ca144a32ca254c933 100644 (file)
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #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 c7a85feb2683dd169990744c928893527975a253..2b4ff37315780cf627d9211801fe281ee837546a 100644 (file)
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #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 38014dabe7394061b4e255778857629686b40c9b..00cb55a6f527d4b3f274bb7d5d11fb4c056d7906 100644 (file)
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #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 9ef79add71844e2ce3c28c38986618f37b0dde15..6423a718702b47b5e7ec446f581b40cf637601c7 100644 (file)
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #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 99b5322d042c892973e22988cf80db56dce4af2a..817cb3bcbdc9ac32154841df89c109e00263a342 100644 (file)
--- 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 5caec75f53c1dfd976393c0dcaeee7ebbfbaceff..3354dde0033a873af3a383f34b4a4a3a26e17434 100644 (file)
--- 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 bee74ddf9ad8b3034c9d8ff5de8e8619ee535647..9048957a1c4eb49d519b72fa854e0a7db5acd66c 100644 (file)
--- 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 2053490566ec3e05641228fd7f42183bb6a3af6c..2113b9b8863d2e76557954554afa00f5616ba165 100644 (file)
--- 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 47c0b8a93972bd7808a7efdeec3f7f97d9c611d3..5c5206fbb2169a32a7d1625d127f7dd7425e119e 100644 (file)
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #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 31c84438a207791ca85562db471439d24df44d73..e3994cd58ceed4e9ebd947582980061cd7ca570b 100644 (file)
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <sys/mman.h>
 #include <zaptel/zaptel.h>
 
@@ -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 9a9f1af30ad45a58cc106a0c1b9c10a3d0b481b3..211f6d4f09eaf17ace2658978fec73fa4f118fa9 100644 (file)
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -31,13 +31,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <errno.h>
 #include <sys/time.h>
 
 #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 93e3dc873e22f07a55a3b210a79bab8fe5fd801b..259662531c93a5871faa43e5df271b80586a73c4 100644 (file)
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -35,13 +35,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 003d93473f3b2ea2afad509c60afde7ad9e1c601..5f8cb60b752e2d2aaa72e7fab8563a8610cf092a 100644 (file)
--- 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 55c65b11b669955e431390682cfc6732f4873626..b2559054a6776eb548c14b5346cff38bf628e651 100644 (file)
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -30,12 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 09e4d3c4edc63131d77d1545fa3ecb5f856e4f5e..d233a03706d3d431a692e3f6e82cb69cbb73e594 100644 (file)
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 05b2624e710f4ddc23256926a956134b51c43b68..e4feaf41af2ff9ea8447a0c56911f53a27e80c4a 100644 (file)
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 35278e0b63ef4c32df9615c75f72e3ed9ab7e91a..f54b64cd292cad47b417f836cd6608a26aa163f6 100644 (file)
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -32,12 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 8c4c4e3371b8cc52228c76e8b987b73b0283729f..dd875d66f502e6ad1742f239de0775d51354be8c 100644 (file)
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -31,11 +31,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 da0ec0ea0e2cd1d3088dd1a5438ae292b65365aa..b34421ccbfbbefa7d9958d38827e6d7107b32d58 100644 (file)
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
@@ -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 05fd02fe6f78abebc121222b6e3a054470d9b2e6..df5b41506782966cc7ace7b56ac729ded47e97d2 100644 (file)
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -30,13 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-// #include <sys/time.h>
-#include <errno.h>
 
 #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 3fe406da3c1c1f537bd93d24f50b641243f97ad8..609520a08983ea6ea5fa0c93558531817d778742 100644 (file)
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -29,12 +29,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 4460b21ea5c6b9cb5e43dc6457cbbc21ffae5210..ffbf2409026278a4d2491215f3476fe07dc8907e 100644 (file)
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 2abddc21949ec0401e6bebd07047c7dd1d6dc033..7d8ccc30c5c6ed6db267d5ffc7573e615a71533c 100644 (file)
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 36a6d4b634b047e9ebda1ffa904edc8a77d9491b..727e377c80d4469da1e2189cd776e773e0009369 100644 (file)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -34,12 +34,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #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 9881711e11a1311fd39a6f9b88de5af5da3e9442..d4b2f03917196d307557727400cddc76bb800861 100644 (file)
--- 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 25476bc47dfe0dce2b34aed10b2c818aaf3111b6..d918cd70759d12629d7a1b0ffcaffe67e27f55a1 100644 (file)
--- 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 <errno.h>
+
 #ifdef SOLARIS
 #define __BEGIN_DECLS
 #define __END_DECLS

diff --git a/main/logger.c b/main/logger.c
index 457c2bd07c62e7da250e803eea2db297ab92179f..d1c5b476af337cb1587486ee7e7a0bb543f2539a 100644 (file)
--- a/main/logger.c
+++ b/main/logger.c
@@ -25,6 +25,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/* 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 5eabbd15f017cb8e4e7af1c8c1cd9ce33eb94415..5a1cf14db9bd68e769507253cf40f01fb527641d 100644 (file)
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -36,13 +36,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <time.h>
 #include <math.h>
-#include <errno.h>
 
 #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 e1fd46718f2f3599a47a9082ab3b921ee1a1bd2f..92d2d5d4f0f34694949dd658ac7eec23a77ece70 100644 (file)
--- 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 55659f3cf752579038b643c1e645b279c2c61f25..d8df0791b738be376ad6531eec354c318fc681f0 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -31,13 +31,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
 #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 5ecf0f7823bbfa2bcd5eb239587b2e04441ba2a5..3d20e3ca364236baca82b3db9e9e3b7bf4cb25bb 100644 (file)
--- 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 86c071cdcfa34fd6ca38f342331dc13a177f9076..129c3cbe99103bbe7fde64f8a06d671036db5bfe 100644 (file)
--- 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 233fc6a694d162573f7653b82ce535255bdab6e2..f40d34186b56dc45cbf522a822e36162d69304a9 100644 (file)
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <libpq-fe.h>                  /* 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 ed01726318c95ee593b49c40b7b26ac1189ca0cf..69db445c8b309ac94e3694ffa9f2e4a1c4de76f3 100644 (file)
--- 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 c4fc4a630061b720f3d63b621463b30c46af0347..0b4d664ff283547369039ad612123b3f87f064f2 100644 (file)
--- 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 0b3b16ed2b38e2bb4f9a5aa9dff74ad669f712ec..a5782f9f090893825a88ba97c115ff7098be1b08 100644 (file)
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -37,12 +37,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #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 9d6356ae71286d78ab7f3f001db8c58048b54827..14550b80f3fe407f364f9f16c3ae4c809be9b9db 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -28,14 +28,12 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <pthread.h>
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.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/res/res_indications.c b/res/res_indications.c
index 49121084b2e500feedbe5ebafdee9c921cfbdd02..a957b7828248e69e6e15e6955646f6af96802fa6 100644 (file)
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -29,13 +29,11 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <sys/stat.h>
 
 #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 b9bfa6c477993e2d1ac0cbe9f46d521472eda08a..57f3a25aba3dcc76b0fde2ab159ceab02f4ffa96 100644 (file)
--- 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 b8cc175d0b765649f4a6bd90e0a7408d318c03c8..28a5e13235204e7074aab3bec8b543512e29b055 100644 (file)
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <errno.h>
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 

diff --git a/res/res_monitor.c b/res/res_monitor.c
index e3698167e247064bb18a0cb254bb5172174fecd8..4a401a411dc85c34cfbf7a107330f2dc2e23ca5e 100644 (file)
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -27,13 +27,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/stat.h>
 #include <libgen.h>
 
 #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 dc42b67903dd448330d307e80422b9765a021e96..d82a65770aa648af8bcd7b0a6956d79b2ab68cc5 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -34,7 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <ctype.h>
 #include <signal.h>
 #include <sys/time.h>
@@ -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 b458d602d4b223bba128f515053b7fa4dcc1be1b..fcde0f7cfd86f2502dcf3d2ff27bb614bdaba027 100644 (file)
--- 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 0576579997e529c5129423952f4ddf6b2b135358..7d42dda2f1e2808c7f8ab449a1d0687b1eeac8c0 100644 (file)
--- 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 c785f2339bfeddb0e3d9d7f2c499076a78a21e15..376ccc052bc24b31e2af3c2e5b2f5a48377a10ef 100644 (file)
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -26,7 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <termios.h>
 #include <sys/time.h>
 #include <time.h>
@@ -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 1fac2c31e6864060b71621e70642ae851df0b7c2..eafc53c9185d96b04447ca441b9cad3e1f4d0347 100644 (file)
--- 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"