remove another set of redundant #include "asterisk/options.h"

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89512 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 9997ae9..ad0837e 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 

diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 3da5027..5a990d9 100644 (file)
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/ulaw.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
 #include "asterisk/config.h"

diff --git a/apps/app_amd.c b/apps/app_amd.c
index fbf23c9..0e16653 100644 (file)
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/dsp.h"
 #include "asterisk/pbx.h"

diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 11d699d..1a49bf3 100644 (file)
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/astdb.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 enum {
        OPT_ACCOUNT = (1 << 0),

diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 4a8b9bf..67d29e6 100644 (file)
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/options.h"
 
 static char *app = "ChanIsAvail";
 

diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index a092690..325c681 100644 (file)
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 
 static char *app = "ChannelRedirect";
 static char *synopsis = "Redirects given channel to a dialplan target.";

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index e416143..250820f 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/utils.h"
 #include "asterisk/say.h"

diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 626d6b5..f529363 100644 (file)
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 static const char *app = "ControlPlayback";
 

diff --git a/apps/app_db.c b/apps/app_db.c
index faf28c0..0cc5043 100644 (file)
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -32,7 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 57756e5..a4d9557 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/say.h"

diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index b823f58..07d81c8 100644 (file)
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/features.h"
 
 #define PICKUPMARK "PICKUPMARK"

diff --git a/apps/app_disa.c b/apps/app_disa.c
index 9ca3ae8..ac74c78 100644 (file)
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/ulaw.h"
 #include "asterisk/callerid.h"
 #include "asterisk/stringfields.h"
-#include "asterisk/options.h"
 
 static char *app = "DISA";
 

diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 1f5425e..85f6789 100644 (file)
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 

diff --git a/apps/app_exec.c b/apps/app_exec.c
index 69eb458..83755a8 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/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 8ebb60c..3de290f 100644 (file)
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/linkedlists.h"
 #include "asterisk/app.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 static const char *app = "ExternalIVR";
 

diff --git a/apps/app_festival.c b/apps/app_festival.c
index 9e1edbd..926638e 100644 (file)
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 #define FESTIVAL_CONFIG "festival.conf"

diff --git a/apps/app_flash.c b/apps/app_flash.c
index 37965fe..d57feeb 100644 (file)
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/options.h"
 
 static char *app = "Flash";
 

diff --git a/apps/app_followme.c b/apps/app_followme.c
index 48677d6..d002c26 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/say.h"

diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 1eaf17a..1bab819 100644 (file)
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
-#include "asterisk/options.h"
 
 static char *app = "GetCPEID";
 

diff --git a/apps/app_ices.c b/apps/app_ices.c
index 0c00178..9397b3c 100644 (file)
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 
 #define ICES "/usr/bin/ices"
 #define LOCAL_ICES "/usr/local/bin/ices"

diff --git a/apps/app_image.c b/apps/app_image.c
index 28598f5..9a36fe7 100644 (file)
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static char *app = "SendImage";
 

diff --git a/apps/app_macro.c b/apps/app_macro.c
index f35e9e5..b087ad3 100644 (file)
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 48250b2..c5a4a9e 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -49,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/dsp.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/manager.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"

diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 94fb1f6..20d1069 100644 (file)
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -160,7 +160,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/module.h"

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 1ce333b..a2d6b32 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/utils.h"

diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index e9b7aab..6c88ed3 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/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 6404276..1f9be6e 100644 (file)
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
 #define MPG_123 "/usr/bin/mpg123"

diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 4c21256..4e72033 100644 (file)
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 
 #define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
 #define NBSCAT "/usr/bin/nbscat8k"

diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 39027f4..46618f4 100644 (file)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/astosp.h"
 

diff --git a/apps/app_page.c b/apps/app_page.c
index 5702735..2ea367e 100644 (file)
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -34,7 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.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 fc63772..7ad7a64 100644 (file)
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"

diff --git a/apps/app_playback.c b/apps/app_playback.c
index a970e6c..a2a4c3d 100644 (file)
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/cli.h"
 #include "asterisk/localtime.h"

diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index ecae9c1..009b9d2 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/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/apps/app_queue.c b/apps/app_queue.c
index ec18fb4..3829823 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -68,7 +68,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"

diff --git a/apps/app_read.c b/apps/app_read.c
index c6a7e45..0d73878 100644 (file)
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/indications.h"
 

diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index eda674b..194cacf 100644 (file)
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/indications.h"
 

diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 82ffb31..8762ef8 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/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"

diff --git a/apps/app_record.c b/apps/app_record.c
index 0b698be..9fe2388 100644 (file)
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/translate.h"
 #include "asterisk/dsp.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index ad4b150..4bca3e0 100644 (file)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -230,7 +230,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"

diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 2d084fc..d0e2344 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/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index 7fd13f9..baced98 100644 (file)
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"

diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 46660e4..3909b30 100644 (file)
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 static const char *app = "SendText";

diff --git a/apps/app_sms.c b/apps/app_sms.c
index 80fdf9f..3c54d43 100644 (file)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR and LOG_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/options.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 a175438..adceaeb 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -29,7 +29,6 @@
  
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.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 e260baa..c887fa7 100644 (file)
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static char *app = "System";
 

diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index d80af7d..0aa5e81 100644 (file)
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
 #include "asterisk/dsp.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 static char *app = "BackgroundDetect";

diff --git a/apps/app_test.c b/apps/app_test.c
index 89853cb..03adc2e 100644 (file)
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"

diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index b808eb4..96c514e 100644 (file)
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 

diff --git a/apps/app_url.c b/apps/app_url.c
index 7d0eb00..44c3909 100644 (file)
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 static char *app = "SendURL";

diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index d3719e9..74e45c3 100644 (file)
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -28,7 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.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 297fd25..1ae60ed 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -91,7 +91,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/module.h"

diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 7671744..b4248fe 100644 (file)
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/lock.h"
 
 static char *synopsis = "Wait for Ring Application";

diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index 1984a5a..e45f243 100644 (file)
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/dsp.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 
 static char *app = "WaitForSilence";
 static char *synopsis = "Waits for a specified amount of silence";

diff --git a/apps/app_while.c b/apps/app_while.c
index ed6c061..c87af53 100644 (file)
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 
 static char *start_app = "While";
 static char *start_desc = 

diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 3732545..9e2ff67 100644 (file)
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"

diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 4af2423..bc3b51d 100644 (file)
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 
 static char *app = "ZapRAS";
 

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 27f3a3e..99f24b8 100644 (file)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"

diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index f0f85b9..f608646 100644 (file)
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sqltypes.h>
 
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"

diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 2feda2f..1c0da16 100644 (file)
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index b146856..5d65041 100644 (file)
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <time.h>
 
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 4517c70..8078cdf 100644 (file)
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <libpq-fe.h>
 
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"

diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 962acc9..3f0b2c9 100644 (file)
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 /*! ISO 8601 standard format */
 #define DATE_FORMAT "%Y-%m-%d %T %z"

diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 11316c5..7eff53d 100644 (file)
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
-#include "asterisk/options.h"
 
 AST_MUTEX_DEFINE_STATIC(lock);
 

diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index ef0cce0..9d322fd 100644 (file)
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -71,7 +71,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index b5e195c..2964054 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 484270e..d9177e5 100644 (file)
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/cli.h"

diff --git a/channels/chan_features.c b/channels/chan_features.c
index f16c87a..65146f4 100644 (file)
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index e28684e..1514dc9 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -49,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index ad3b4e5..b17965b 100644 (file)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -72,7 +72,6 @@ extern "C" {
 #include "asterisk/module.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 235dc7c..6e2a0ab 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -64,7 +64,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/translate.h"
 #include "asterisk/md5.h"

diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index f8072fd..8763397 100644 (file)
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_local.c b/channels/chan_local.c
index c6b5638..99b23cd 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index be9b2f0..22e23f4 100644 (file)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 36cf5be..e727903 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/io.h"
 #include "asterisk/frame.h"
 #include "asterisk/translate.h"

diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 86a042c..e190a43 100644 (file)
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 
 static const char tdesc[] = "Network Broadcast Sound Driver";

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 8f3e084..ed2f441 100644 (file)
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -59,7 +59,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/cli.h"

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index f468a98..233e5e8 100644 (file)
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/callerid.h"
 #include "asterisk/causes.h"

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 93fc84e..4d651cf 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -102,7 +102,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 4014d74..7640ef3 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 093d03c..0be2bfc 100644 (file)
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/sched.h"
 #include "asterisk/io.h"
 #include "asterisk/rtp.h"

diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index dbe2fc3..c1d181e 100644 (file)
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -103,7 +103,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/cli.h"

diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index f7443a8..eee797b 100644 (file)
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/callerid.h"
 #include "asterisk/dsp.h"
 #include "asterisk/features.h"

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 970b52c..490c0de 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -74,7 +74,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/alaw.h"

diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 5a06a8f..3ddec3e 100644 (file)
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/options.h"
 #include "asterisk/md5.h"
 #include "asterisk/astdb.h"
 #include "asterisk/utils.h"

diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index f66f5e6..bf5a7d6 100644 (file)
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 4be41d1..e53097f 100644 (file)
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/callerid.h"
 
 static int callerpres_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)

diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 01b13ce..32dbf76 100644 (file)
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cli.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/utils.h"

diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 9228fd6..142b768 100644 (file)
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -29,7 +29,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/funcs/func_db.c b/funcs/func_db.c
index 0fa17fd..1c15e5d 100644 (file)
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/astdb.h"

diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index fbe51de..d698819 100644 (file)
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/enum.h"
 #include "asterisk/app.h"
 

diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index 19cd2e5..f3f49bf 100644 (file)
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 /*! 
  * Some systems define the second arg to iconv() as (const char *),

diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 3cef46a..53b05a3 100644 (file)
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 2928ba3..194a321 100644 (file)
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"

diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 443a028..a3db21d 100644 (file)
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static int acf_rand_exec(struct ast_channel *chan, const char *cmd,
                         char *parse, char *buffer, size_t buflen)

diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index 08950da..7b269d9 100644 (file)
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 8d678fc..8881a15 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <regex.h>
 
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"

diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index d90281a..d1efd97 100644 (file)
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static int timeout_read(struct ast_channel *chan, const char *cmd, char *data,
                        char *buf, size_t len)

diff --git a/funcs/func_version.c b/funcs/func_version.c
index 4de7131..6fed3bf 100644 (file)
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/version.h"
 #include "asterisk/build.h"
 

diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index cd558d4..24d8314 100644 (file)
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static int acf_vmcount_exec(struct ast_channel *chan, const char *cmd, char *argsstr, char *buf, size_t len)
 {

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 442d3e1..9ee6c02 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"    /* ast_config_AST_CONFIG_DIR */
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
 #include "asterisk/cli.h"

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 3fbc669..ec3da12 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/frame.h"

diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index 45a951d..9017d74 100644 (file)
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
 

diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index febadc1..11fe8c3 100644 (file)
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/frame.h"

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 46f0790..143bea5 100644 (file)
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -32,7 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"

diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 5516162..0b122b0 100644 (file)
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/frame.h"

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 9b64df7..c4cd739 100644 (file)
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/callerid.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 
 /*