diff options
224 files changed, 1849 insertions, 1846 deletions
@@ -18,13 +18,13 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include <asterisk/acl.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/srv.h> +#include "asterisk/acl.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/srv.h" #include <arpa/inet.h> #include <sys/socket.h> #include <netdb.h> @@ -135,8 +135,8 @@ #ifndef _AESOPT_H #define _AESOPT_H -#include <asterisk/aes.h> -#include <asterisk/endian.h> +#include "asterisk/aes.h" +#include "asterisk/endian.h" /* CONFIGURATION - USE OF DEFINES @@ -11,7 +11,7 @@ * the GNU General Public License */ -#include <asterisk/alaw.h> +#include "asterisk/alaw.h" #define AMI_MASK 0x55 @@ -22,16 +22,16 @@ #include <sys/types.h> #include <sys/stat.h> #include <regex.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/file.h> -#include <asterisk/app.h> -#include <asterisk/dsp.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/indications.h> +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/file.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/indications.h" #include "asterisk.h" #include "astconf.h" diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 2ec1810a7..c6b451a30 100755 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -12,15 +12,15 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/adsi.h> -#include <asterisk/options.h> -#include <asterisk/utils.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" +#include "asterisk/adsi.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include <netinet/in.h> #include <stdlib.h> #include <unistd.h> @@ -30,8 +30,8 @@ #include <stdio.h> #include <errno.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" static char *tdesc = "Asterisk ADSI Programming Application"; diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index bb4ca3e48..59486972f 100755 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -18,21 +18,21 @@ * */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#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> -#include <asterisk/localtime.h> -#include <asterisk/callerid.h> -#include <asterisk/astdb.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" +#include "asterisk/translate.h" +#include "asterisk/ulaw.h" +#include "asterisk/options.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/config.h" +#include "asterisk/localtime.h" +#include "asterisk/callerid.h" +#include "asterisk/astdb.h" #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 8c5d0722e..e64b5147b 100755 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/app.h> -#include <asterisk/astdb.h> -#include <asterisk/utils.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" +#include "asterisk/app.h" +#include "asterisk/astdb.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_cdr.c b/apps/app_cdr.c index ce04f72f6..8e6752ac6 100755 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -12,9 +12,9 @@ */ #include <sys/types.h> -#include <asterisk/channel.h> -#include <asterisk/module.h> -#include <asterisk/pbx.h> +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" #include <stdlib.h> diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index 23fb373f3..4047f6ba9 100755 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -13,13 +13,13 @@ * */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/app.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" +#include "asterisk/app.h" #include <stdlib.h> #include <unistd.h> #include <errno.h> diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index c12f26246..e90dab41f 100755 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -11,26 +11,27 @@ * the GNU General Public License */ -#define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" - -#include <../asterisk.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/features.h> -#include <asterisk/options.h> -#include <asterisk/app.h> -#include <asterisk/utils.h> -#include <asterisk/say.h> -#include <asterisk/pbx.h> -#include <asterisk/translate.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> #include <stdlib.h> #include <unistd.h> #include <string.h> #include <ctype.h> +#include "asterisk.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/features.h" +#include "asterisk/options.h" +#include "asterisk/app.h" +#include "asterisk/utils.h" +#include "asterisk/say.h" +#include "asterisk/pbx.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" + +#define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" + AST_MUTEX_DEFINE_STATIC(modlock); #define ast_fit_in_short(in) (in < -32768 ? -32768 : in > 32767 ? 32767 : in) diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index af2b79900..bf56dcaa2 100755 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/app.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/utils.h> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_curl.c b/apps/app_curl.c index 558117d08..ecc4a2c6b 100755 --- a/apps/app_curl.c +++ b/apps/app_curl.c @@ -12,14 +12,14 @@ * redistribution. */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/cli.h> -#include <asterisk/options.h> -#include <asterisk/module.h> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/cli.h" +#include "asterisk/options.h" +#include "asterisk/module.h" #include <stdlib.h> #include <string.h> #include <curl/curl.h> diff --git a/apps/app_cut.c b/apps/app_cut.c index 6bcc9be20..6671c4e41 100755 --- a/apps/app_cut.c +++ b/apps/app_cut.c @@ -17,12 +17,12 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" /* Maximum length of any variable */ #define MAXRESULT 1024 diff --git a/apps/app_datetime.c b/apps/app_datetime.c index 2f3cc4f20..470a4fbee 100755 --- a/apps/app_datetime.c +++ b/apps/app_datetime.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/say.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" +#include "asterisk/say.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_db.c b/apps/app_db.c index 43c8ec90e..830e38ac0 100755 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -14,14 +14,14 @@ */ #include <sys/types.h> -#include <asterisk/options.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/astdb.h> -#include <asterisk/lock.h> +#include "asterisk/options.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/astdb.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_dial.c b/apps/app_dial.c index e69b8f084..95550d77e 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -11,23 +11,23 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.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> -#include <asterisk/config.h> -#include <asterisk/features.h> -#include <asterisk/musiconhold.h> -#include <asterisk/callerid.h> -#include <asterisk/utils.h> -#include <asterisk/app.h> -#include <asterisk/causes.h> -#include <asterisk/manager.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/config.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" +#include "asterisk/app.h" +#include "asterisk/causes.h" +#include "asterisk/manager.h" #include <stdlib.h> #include <errno.h> #include <unistd.h> diff --git a/apps/app_directory.c b/apps/app_directory.c index 3e4b7d353..5a143c883 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -11,21 +11,21 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/say.h> -#include <asterisk/utils.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" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/utils.h" #include <string.h> #include <ctype.h> #include <stdlib.h> #include <stdio.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" static char *tdesc = "Extension Directory"; static char *app = "Directory"; diff --git a/apps/app_disa.c b/apps/app_disa.c index e60562c47..0eaf468ec 100755 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -13,17 +13,17 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/app.h> -#include <asterisk/indications.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/ulaw.h> -#include <asterisk/callerid.h> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/app.h" +#include "asterisk/indications.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/ulaw.h" +#include "asterisk/callerid.h" #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index c44528ae4..82c573dde 100755 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -11,15 +11,15 @@ * the GNU General Public License (and disclaimed to Digium) */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_echo.c b/apps/app_echo.c index 09d8a5157..425e0e596 100755 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.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" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c index 4664cd68a..717e3f3fe 100755 --- a/apps/app_enumlookup.c +++ b/apps/app_enumlookup.c @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/options.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/enum.h> -#include <asterisk/utils.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" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/enum.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_eval.c b/apps/app_eval.c index 333add8a1..527ec516b 100755 --- a/apps/app_eval.c +++ b/apps/app_eval.c @@ -17,12 +17,12 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" /* Maximum length of any variable */ #define MAXRESULT 1024 diff --git a/apps/app_exec.c b/apps/app_exec.c index f4e156927..2a6763ba1 100755 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -17,12 +17,12 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" /* Maximum length of any variable */ #define MAXRESULT 1024 diff --git a/apps/app_festival.c b/apps/app_festival.c index 91a23c1fa..fcaa8deb9 100755 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -12,15 +12,15 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/md5.h> -#include <asterisk/config.h> -#include <asterisk/utils.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" +#include "asterisk/md5.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_flash.c b/apps/app_flash.c index a4bf4e84e..9c8e8dbec 100755 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/options.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/options.h" #include <sys/ioctl.h> #ifdef __linux__ #include <linux/zaptel.h> diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 87c5ac939..a398333ce 100755 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -9,12 +9,12 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index a9846ed1f..2095498e6 100755 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/adsi.h> -#include <asterisk/options.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" +#include "asterisk/adsi.h" +#include "asterisk/options.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c index bd2205ab4..067fae59b 100755 --- a/apps/app_groupcount.c +++ b/apps/app_groupcount.c @@ -17,15 +17,15 @@ #include <string.h> #include <sys/types.h> #include <regex.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/utils.h> -#include <asterisk/cli.h> -#include <asterisk/app.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/utils.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" STANDARD_LOCAL_USER; diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c index e008632d9..63102de08 100755 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -32,20 +32,20 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <unistd.h> #include <string.h> #include <stdlib.h> #include <dirent.h> -#include "../astconf.h" +#include "astconf.h" static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder."; static char *app_hasvoicemail = "HasVoicemail"; diff --git a/apps/app_ices.c b/apps/app_ices.c index 395407dbe..c5ffa45fd 100755 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/frame.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include <string.h> #include <stdio.h> #include <signal.h> @@ -27,7 +27,7 @@ #include <fcntl.h> #include <sys/time.h> #include <errno.h> -#include "../astconf.h" +#include "astconf.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 d859a4aeb..44ed0b85a 100755 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_intercom.c b/apps/app_intercom.c index 5c2782433..53a6ec45d 100755 --- a/apps/app_intercom.c +++ b/apps/app_intercom.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c index d182eecf2..420225a32 100755 --- a/apps/app_ivrdemo.c +++ b/apps/app_ivrdemo.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> -#include <asterisk/app.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c index 27db5be34..42bc18e1a 100755 --- a/apps/app_lookupblacklist.c +++ b/apps/app_lookupblacklist.c @@ -11,17 +11,17 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.h> -#include <asterisk/astdb.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/astdb.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c index 89b7664e5..f41411ae0 100755 --- a/apps/app_lookupcidname.c +++ b/apps/app_lookupcidname.c @@ -11,17 +11,17 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.h> -#include <asterisk/astdb.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/astdb.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_macro.c b/apps/app_macro.c index b0d175d68..f0b37aed3 100755 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -12,15 +12,15 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#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> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#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" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_math.c b/apps/app_math.c index d145ea55a..0e0b6304d 100755 --- a/apps/app_math.c +++ b/apps/app_math.c @@ -9,20 +9,20 @@ * */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.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> -#include <asterisk/app.h> -#include <asterisk/manager.h> -#include <asterisk/localtime.h> -#include <asterisk/cli.h> -#include <asterisk/utils.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" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/module.h" +#include "asterisk/app.h" +#include "asterisk/manager.h" +#include "asterisk/localtime.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <errno.h> #include <unistd.h> @@ -34,11 +34,11 @@ #include <sys/types.h> #include <time.h> #include <dirent.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> +#include "asterisk/module.h" +#include "asterisk/translate.h" #include <ctype.h> #include <sys/file.h> -#include "../astconf.h" +#include "astconf.h" static char *tdesc = "Basic Math Functions"; diff --git a/apps/app_md5.c b/apps/app_md5.c index 1d09be4df..dfc8dd5db 100755 --- a/apps/app_md5.c +++ b/apps/app_md5.c @@ -9,14 +9,14 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/utils.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 25fb1c732..35386f96a 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -11,29 +11,29 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/app.h> -#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> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/app.h" +#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" #include <stdlib.h> #include <unistd.h> #include <string.h> #include <errno.h> #include <stdlib.h> #include <sys/ioctl.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #ifdef __linux__ #include <linux/zaptel.h> diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 6b9e6b763..4f729cd9f 100755 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.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" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_mp3.c b/apps/app_mp3.c index b38ec41c2..4a4bcf0b5 100755 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/frame.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include <string.h> #include <stdio.h> #include <signal.h> diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index f8b4b37b9..13f3e7ae9 100755 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/frame.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" #include <string.h> #include <stdio.h> #include <signal.h> diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 1decb7973..0c58dd63a 100755 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -11,17 +11,17 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/options.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/astosp.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" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/astosp.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index ad1ab6dd8..0c8e71945 100755 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -15,16 +15,16 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/features.h> -#include <asterisk/options.h> -#include <asterisk/logger.h> -#include <asterisk/say.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" +#include "asterisk/features.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> diff --git a/apps/app_playback.c b/apps/app_playback.c index 7730c93b4..26b204605 100755 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/utils.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" +#include "asterisk/translate.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 13bc38c30..7eab0dd39 100755 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -11,19 +11,19 @@ * the GNU General Public License */ -#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> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.h> -#include <asterisk/app.h> -#include <asterisk/config.h> +#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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/app.h" +#include "asterisk/config.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_queue.c b/apps/app_queue.c index b352a08f2..0b94257e7 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -39,24 +39,24 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.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> -#include <asterisk/features.h> -#include <asterisk/musiconhold.h> -#include <asterisk/cli.h> -#include <asterisk/manager.h> -#include <asterisk/config.h> -#include <asterisk/monitor.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/astdb.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/cli.h" +#include "asterisk/manager.h" +#include "asterisk/config.h" +#include "asterisk/monitor.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/astdb.h" #include <stdlib.h> #include <errno.h> #include <unistd.h> @@ -67,7 +67,7 @@ #include <sys/signal.h> #include <netinet/in.h> -#include "../astconf.h" +#include "astconf.h" #define QUEUE_STRATEGY_RINGALL 0 #define QUEUE_STRATEGY_ROUNDROBIN 1 diff --git a/apps/app_random.c b/apps/app_random.c index f8558a3b4..d49af9fdd 100755 --- a/apps/app_random.c +++ b/apps/app_random.c @@ -11,12 +11,12 @@ * */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/apps/app_read.c b/apps/app_read.c index cb30a7a66..eaff923e9 100755 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/app.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 3adc79a9c..92815472b 100755 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -16,13 +16,13 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/app.h> -#include <asterisk/module.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/app.h" +#include "asterisk/module.h" static char *tdesc = "Stores output of file into a variable"; diff --git a/apps/app_realtime.c b/apps/app_realtime.c index d0895f411..d6450739b 100755 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -12,15 +12,15 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/options.h> -#include <asterisk/pbx.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> -#include <asterisk/cli.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/cli.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_record.c b/apps/app_record.c index a06108162..e47c2941a 100755 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/dsp.h> -#include <asterisk/utils.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" +#include "asterisk/translate.h" +#include "asterisk/dsp.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 040f8b0ac..b04c8489b 100755 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -120,19 +120,19 @@ enum {SOURCE_RPT, SOURCE_LNK, SOURCE_RMT}; enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM}; -#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> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/options.h> -#include <asterisk/config.h> -#include <asterisk/say.h> -#include <asterisk/localtime.h> +#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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/localtime.h" #include <signal.h> #include <stdio.h> #include <unistd.h> diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index a7d09355e..cc2b28c18 100755 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -15,13 +15,13 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/say.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/say.h" static char *tdesc = "Say time"; diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index c908ec7e9..d74a8b4ad 100755 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#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/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#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 <string.h> #include <stdlib.h> diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index 4bacbaa50..391b2b2a2 100755 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 78bd17c43..86cf9bd03 100755 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c index d0ebd2e13..4684fdd8b 100755 --- a/apps/app_setcdruserfield.c +++ b/apps/app_setcdruserfield.c @@ -12,14 +12,14 @@ */ #include <sys/types.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/pbx.h> -#include <asterisk/logger.h> -#include <asterisk/config.h> -#include <asterisk/manager.h> -#include <asterisk/utils.h> +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/logger.h" +#include "asterisk/config.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <string.h> diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c index 44b9dbd04..88e847651 100755 --- a/apps/app_setcidname.c +++ b/apps/app_setcidname.c @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.h> -#include <asterisk/utils.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c index bceb67792..e7324da3d 100755 --- a/apps/app_setcidnum.c +++ b/apps/app_setcidnum.c @@ -12,16 +12,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.h> -#include <asterisk/utils.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_setrdnis.c b/apps/app_setrdnis.c index 3b64c0c85..4c42c9567 100755 --- a/apps/app_setrdnis.c +++ b/apps/app_setrdnis.c @@ -12,16 +12,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.h> -#include <asterisk/callerid.h> -#include <asterisk/utils.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" +#include "asterisk/callerid.h" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c index 9685b3964..d998e18bf 100755 --- a/apps/app_settransfercapability.c +++ b/apps/app_settransfercapability.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/options.h> -#include <asterisk/transcap.h> +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/transcap.h" #include <string.h> #include <stdlib.h> -#include <asterisk/transcap.h> +#include "asterisk/transcap.h" static char *app = "SetTransferCapability"; diff --git a/apps/app_skel.c b/apps/app_skel.c index fdfd64949..f1910a573 100755 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> -#include <asterisk/app.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_sms.c b/apps/app_sms.c index dd140f637..401d20fea 100755 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -9,15 +9,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/alaw.h> -#include <asterisk/callerid.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" +#include "asterisk/module.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <dirent.h> #include <ctype.h> -#include "../astconf.h" +#include "astconf.h" /* output using Alaw rather than linear */ /*#define OUTALAW */ diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index 73408958d..6631b0ad7 100755 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -12,12 +12,12 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.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" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c index e83ab2aac..3185dad50 100755 --- a/apps/app_sql_postgres.c +++ b/apps/app_sql_postgres.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/linkedlists.h> -#include <asterisk/chanvars.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" +#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c index 82d513f85..cc23309ab 100755 --- a/apps/app_striplsd.c +++ b/apps/app_striplsd.c @@ -12,12 +12,12 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.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" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_substring.c b/apps/app_substring.c index fb6d81f6c..5f0609ef5 100755 --- a/apps/app_substring.c +++ b/apps/app_substring.c @@ -12,13 +12,13 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/pbx.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" +#include "asterisk/pbx.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_system.c b/apps/app_system.c index c08e0ed42..ace307333 100755 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/app.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" +#include "asterisk/app.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 681f44223..4d4d2662d 100755 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/utils.h> -#include <asterisk/dsp.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" +#include "asterisk/translate.h" +#include "asterisk/utils.h" +#include "asterisk/dsp.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_test.c b/apps/app_test.c index 74ca7c5a0..370c547fd 100755 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -14,19 +14,19 @@ #include <sys/types.h> #include <sys/stat.h> -#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> -#include <asterisk/utils.h> +#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" +#include "asterisk/utils.h" #include <string.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> -#include "../astconf.h" +#include "astconf.h" static char *tdesc = "Interface Test Application"; diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 846e4fcbf..f3628959c 100755 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -11,12 +11,12 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.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" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c index 5cffb271a..dc39106de 100755 --- a/apps/app_txtcidname.c +++ b/apps/app_txtcidname.c @@ -11,16 +11,16 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/options.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/enum.h> -#include <asterisk/utils.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" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/enum.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_url.c b/apps/app_url.c index e3407c41a..df63a0803 100755 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/image.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" +#include "asterisk/translate.h" +#include "asterisk/image.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 82de783b3..71890be73 100755 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -8,13 +8,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/manager.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" +#include "asterisk/manager.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_verbose.c b/apps/app_verbose.c index ba6a908bb..5d767b9b0 100755 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -15,11 +15,11 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/options.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" static char *tdesc = "Send verbose output"; diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index d753097ef..66ed5a3ba 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -14,24 +14,24 @@ * George Konstantoulakis <gkon@inaccessnetworks.com> */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.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> -#include <asterisk/adsi.h> -#include <asterisk/app.h> -#include <asterisk/manager.h> -#include <asterisk/dsp.h> -#include <asterisk/localtime.h> -#include <asterisk/cli.h> -#include <asterisk/utils.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" +#include "asterisk/config.h" +#include "asterisk/say.h" +#include "asterisk/module.h" +#include "asterisk/adsi.h" +#include "asterisk/app.h" +#include "asterisk/manager.h" +#include "asterisk/dsp.h" +#include "asterisk/localtime.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" #ifdef USE_ODBC_STORAGE -#include <asterisk/res_odbc.h> +#include "asterisk/res_odbc.h" #endif #include <stdlib.h> #include <errno.h> @@ -46,8 +46,8 @@ #include <time.h> #include <dirent.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #define COMMAND_TIMEOUT 5000 diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index 3bf8625b5..93dec96d7 100755 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -12,13 +12,13 @@ */ #include <sys/types.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/options.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" +#include "asterisk/options.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index c3e6aad18..b1294c179 100755 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -17,13 +17,13 @@ * the GNU General Public License */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/dsp.h> -#include <asterisk/module.h> -#include <asterisk/options.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/dsp.h" +#include "asterisk/module.h" +#include "asterisk/options.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_while.c b/apps/app_while.c index 5822c2ff5..748619ac6 100755 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -12,14 +12,14 @@ */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/utils.h> -#include <asterisk/config.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/utils.h" +#include "asterisk/config.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index 4972d5396..38ec03fe5 100755 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.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" +#include "asterisk/translate.h" #include <string.h> #include <stdlib.h> diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index d34cd1946..dc02f8a12 100755 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -14,18 +14,18 @@ * GPL application. */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#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> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#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" #include <stdlib.h> #include <unistd.h> #include <errno.h> diff --git a/apps/app_zapras.c b/apps/app_zapras.c index d835e12f8..517bbb50e 100755 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/options.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" +#include "asterisk/options.h" #include <sys/ioctl.h> #include <sys/wait.h> #ifdef __linux__ diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index bb38d98bb..195fc657c 100755 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -16,18 +16,18 @@ * GPL application. */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#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> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#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" #include <stdlib.h> #include <unistd.h> #include <errno.h> diff --git a/ast_expr.y b/ast_expr.y index 0c8c40a8d..de07a0c9d 100755 --- a/ast_expr.y +++ b/ast_expr.y @@ -21,8 +21,8 @@ #include <errno.h> #include <regex.h> #include <limits.h> -#include <asterisk/ast_expr.h> -#include <asterisk/logger.h> +#include "asterisk/ast_expr.h" +#include "asterisk/logger.h" #ifndef QUAD_MIN #ifdef LONG_LONG_MIN diff --git a/asterisk.c b/asterisk.c index 562cf3769..589ec447f 100755 --- a/asterisk.c +++ b/asterisk.c @@ -13,32 +13,32 @@ #include <unistd.h> #include <stdlib.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/cli.h> -#include <asterisk/channel.h> -#include <asterisk/ulaw.h> -#include <asterisk/alaw.h> -#include <asterisk/callerid.h> -#include <asterisk/module.h> -#include <asterisk/image.h> -#include <asterisk/tdd.h> -#include <asterisk/term.h> -#include <asterisk/manager.h> -#include <asterisk/pbx.h> -#include <asterisk/enum.h> -#include <asterisk/rtp.h> -#include <asterisk/app.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> -#include <asterisk/file.h> +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/channel.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" +#include "asterisk/module.h" +#include "asterisk/image.h" +#include "asterisk/tdd.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/pbx.h" +#include "asterisk/enum.h" +#include "asterisk/rtp.h" +#include "asterisk/app.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/file.h" #include <sys/resource.h> #include <fcntl.h> #include <stdio.h> #include <signal.h> #include <sched.h> -#include <asterisk/io.h> -#include <asterisk/lock.h> +#include "asterisk/io.h" +#include "asterisk/lock.h" #include <sys/socket.h> #include <sys/un.h> #include <sys/wait.h> @@ -47,7 +47,7 @@ #include <ctype.h> #include "editline/histedit.h" #include "asterisk.h" -#include <asterisk/config.h> +#include "asterisk/config.h" #include <sys/resource.h> #include <grp.h> #include <pwd.h> @@ -19,10 +19,10 @@ #include <stdio.h> #include <string.h> #include <time.h> -#include <asterisk/cli.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/lock.h> +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" #define SOME_PRIME 563 diff --git a/autoservice.c b/autoservice.c index 772e9dc84..0d9d1b2f5 100755 --- a/autoservice.c +++ b/autoservice.c @@ -19,20 +19,20 @@ #include <errno.h> #include <unistd.h> #include <math.h> /* For PI */ -#include <asterisk/pbx.h> -#include <asterisk/frame.h> -#include <asterisk/sched.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/file.h> -#include <asterisk/translate.h> -#include <asterisk/manager.h> -#include <asterisk/chanvars.h> -#include <asterisk/linkedlists.h> -#include <asterisk/indications.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> +#include "asterisk/pbx.h" +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/translate.h" +#include "asterisk/manager.h" +#include "asterisk/chanvars.h" +#include "asterisk/linkedlists.h" +#include "asterisk/indications.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #define MAX_AUTOMONS 256 diff --git a/callerid.c b/callerid.c index 3a55a7311..9e5c78731 100755 --- a/callerid.c +++ b/callerid.c @@ -21,14 +21,14 @@ #include <unistd.h> #include <math.h> #include <ctype.h> -#include <asterisk/ulaw.h> -#include <asterisk/alaw.h> -#include <asterisk/frame.h> -#include <asterisk/channel.h> -#include <asterisk/callerid.h> -#include <asterisk/logger.h> -#include <asterisk/fskmodem.h> -#include <asterisk/utils.h> +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/frame.h" +#include "asterisk/channel.h" +#include "asterisk/callerid.h" +#include "asterisk/logger.h" +#include "asterisk/fskmodem.h" +#include "asterisk/utils.h" struct callerid_state { fsk_data fskd; @@ -14,14 +14,14 @@ * */ -#include <asterisk/lock.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/logger.h> -#include <asterisk/callerid.h> -#include <asterisk/causes.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/logger.h" +#include "asterisk/callerid.h" +#include "asterisk/causes.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include <unistd.h> #include <stdlib.h> #include <string.h> diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index 150733a2b..ca5b96370 100755 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -15,13 +15,13 @@ */ #include <sys/types.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/utils.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk.h" +#include "astconf.h" #define CSV_LOG_DIR "/cdr-csv" #define CSV_MASTER "/Master.csv" diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index bfde470e2..69b6f2c51 100755 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -15,15 +15,15 @@ */ #include <sys/types.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/pbx.h> -#include <asterisk/logger.h> -#include <asterisk/utils.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/pbx.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk.h" +#include "astconf.h" #define CUSTOM_LOG_DIR "/cdr_custom" diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 110aebadc..6ba46fd5f 100755 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -9,15 +9,15 @@ */ #include <sys/types.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/utils.h> -#include <asterisk/manager.h> -#include <asterisk/config.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk/manager.h" +#include "asterisk/config.h" +#include "asterisk.h" +#include "astconf.h" #include <strings.h> #include <unistd.h> #include <time.h> diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index 7aefd9389..c31fb63f3 100755 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -12,13 +12,13 @@ */ #include <sys/types.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include "../asterisk.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk.h" #include <stdio.h> #include <string.h> diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 44e6d25fb..5aa2430a2 100755 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -15,13 +15,13 @@ */ #include <sys/types.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include "../asterisk.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk.h" #include <stdio.h> #include <string.h> diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index 6db044bb5..ec6018cb1 100755 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -14,12 +14,12 @@ */ #include <sys/types.h> -#include <asterisk/channel.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/utils.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk.h" +#include "astconf.h" #include <unistd.h> #include <string.h> diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 69866a3ae..5e99529f6 100755 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -35,13 +35,13 @@ CREATE TABLE [dbo].[cdr] ( */ #include <sys/types.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/cdr.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include "../asterisk.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cdr.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk.h" #include <stdio.h> #include <string.h> @@ -19,27 +19,27 @@ #include <errno.h> #include <unistd.h> #include <math.h> /* For PI */ -#include <asterisk/pbx.h> -#include <asterisk/frame.h> -#include <asterisk/sched.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/musiconhold.h> -#include <asterisk/logger.h> -#include <asterisk/say.h> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/translate.h> -#include <asterisk/manager.h> -#include <asterisk/chanvars.h> -#include <asterisk/linkedlists.h> -#include <asterisk/indications.h> -#include <asterisk/monitor.h> -#include <asterisk/causes.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/app.h> -#include <asterisk/transcap.h> +#include "asterisk/pbx.h" +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/musiconhold.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/translate.h" +#include "asterisk/manager.h" +#include "asterisk/chanvars.h" +#include "asterisk/linkedlists.h" +#include "asterisk/indications.h" +#include "asterisk/monitor.h" +#include "asterisk/causes.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" +#include "asterisk/transcap.h" #ifdef ZAPTEL_OPTIMIZATIONS #include <sys/ioctl.h> #ifdef __linux__ diff --git a/channels/chan_agent.c b/channels/chan_agent.c index ac8be55cd..46427e2cb 100755 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -13,28 +13,28 @@ #include <stdio.h> #include <string.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> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/callerid.h> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/app.h> -#include <asterisk/musiconhold.h> -#include <asterisk/manager.h> -#include <asterisk/features.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/astdb.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" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" +#include "asterisk/features.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/astdb.h" #include <sys/socket.h> #include <errno.h> #include <unistd.h> diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index cde0e9e2d..215a55ef0 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -9,17 +9,17 @@ * the GNU General Public License */ -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/module.h> -#include <asterisk/options.h> -#include <asterisk/pbx.h> -#include <asterisk/config.h> -#include <asterisk/cli.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/endian.h> +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/endian.h" #include <unistd.h> #include <fcntl.h> #include <errno.h> diff --git a/channels/chan_features.c b/channels/chan_features.c index 9ddfc5416..8db531d3c 100755 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -13,24 +13,24 @@ #include <stdio.h> #include <string.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> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/callerid.h> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/app.h> -#include <asterisk/musiconhold.h> -#include <asterisk/manager.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" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" #include <sys/socket.h> #include <errno.h> #include <unistd.h> diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 9b83f779f..351237b70 100755 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -49,23 +49,23 @@ #ifdef __cplusplus extern "C" { #endif -#include <asterisk/lock.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/pbx.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/callerid.h> -#include <asterisk/cli.h> -#include <asterisk/dsp.h> -#include <asterisk/causes.h> +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/dsp.h" +#include "asterisk/causes.h" #ifdef __cplusplus } #endif diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 928ec8aa6..b4b14c8b0 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -11,33 +11,33 @@ * the GNU General Public License */ -#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> -#include <asterisk/io.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/cli.h> -#include <asterisk/translate.h> -#include <asterisk/md5.h> -#include <asterisk/cdr.h> -#include <asterisk/crypto.h> -#include <asterisk/acl.h> -#include <asterisk/manager.h> -#include <asterisk/callerid.h> -#include <asterisk/app.h> -#include <asterisk/astdb.h> -#include <asterisk/musiconhold.h> -#include <asterisk/features.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/localtime.h> -#include <asterisk/aes.h> -#include <asterisk/dnsmgr.h> +#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" +#include "asterisk/io.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/translate.h" +#include "asterisk/md5.h" +#include "asterisk/cdr.h" +#include "asterisk/crypto.h" +#include "asterisk/acl.h" +#include "asterisk/manager.h" +#include "asterisk/callerid.h" +#include "asterisk/app.h" +#include "asterisk/astdb.h" +#include "asterisk/musiconhold.h" +#include "asterisk/features.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/localtime.h" +#include "asterisk/aes.h" +#include "asterisk/dnsmgr.h" #include <sys/mman.h> #include <arpa/inet.h> #include <dirent.h> @@ -69,7 +69,7 @@ #include "iax2.h" #include "iax2-parser.h" #include "iax2-provision.h" -#include "../astconf.h" +#include "astconf.h" /* Define NEWJB to use the new channel independent jitterbuffer, * otherwise, use the old jitterbuffer */ diff --git a/channels/chan_local.c b/channels/chan_local.c index 05a20992e..bc177f676 100755 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -13,24 +13,24 @@ #include <stdio.h> #include <string.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> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/callerid.h> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/app.h> -#include <asterisk/musiconhold.h> -#include <asterisk/manager.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" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" #include <sys/socket.h> #include <errno.h> #include <unistd.h> diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 82ed6edf5..78f7d3749 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -55,28 +55,28 @@ #include <stdio.h> #include <string.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> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/callerid.h> -#include <asterisk/cli.h> -#include <asterisk/say.h> -#include <asterisk/cdr.h> -#include <asterisk/astdb.h> -#include <asterisk/features.h> -#include <asterisk/app.h> -#include <asterisk/musiconhold.h> -#include <asterisk/utils.h> -#include <asterisk/causes.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" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" +#include "asterisk/cdr.h" +#include "asterisk/astdb.h" +#include "asterisk/features.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" #include <sys/socket.h> #include <sys/ioctl.h> #include <net/if.h> @@ -91,7 +91,7 @@ #include <netinet/in_systm.h> #include <netinet/ip.h> -#include <asterisk/dsp.h> +#include "asterisk/dsp.h" #include <ctype.h> #ifndef IPTOS_MINCOST diff --git a/channels/chan_modem.c b/channels/chan_modem.c index 64c73aa38..ad80e3e48 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -13,15 +13,15 @@ #include <stdio.h> #include <string.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> -#include <asterisk/vmodem.h> -#include <asterisk/utils.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" +#include "asterisk/vmodem.h" +#include "asterisk/utils.h" #include <sys/socket.h> #include <sys/time.h> #include <errno.h> diff --git a/channels/chan_modem_aopen.c b/channels/chan_modem_aopen.c index 4d18137f0..c14a8f6d4 100755 --- a/channels/chan_modem_aopen.c +++ b/channels/chan_modem_aopen.c @@ -16,12 +16,12 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#include <asterisk/lock.h> -#include <asterisk/vmodem.h> -#include <asterisk/module.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> +#include "asterisk/lock.h" +#include "asterisk/vmodem.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" #define STATE_COMMAND 0 #define STATE_VOICE 1 diff --git a/channels/chan_modem_bestdata.c b/channels/chan_modem_bestdata.c index ec24369dc..aff1d5df9 100755 --- a/channels/chan_modem_bestdata.c +++ b/channels/chan_modem_bestdata.c @@ -18,12 +18,12 @@ #include <stdlib.h> #include <errno.h> #include <unistd.h> -#include <asterisk/lock.h> -#include <asterisk/vmodem.h> -#include <asterisk/module.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> +#include "asterisk/lock.h" +#include "asterisk/vmodem.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" #define STATE_COMMAND 0 #define STATE_VOICE 1 diff --git a/channels/chan_modem_i4l.c b/channels/chan_modem_i4l.c index bb032e2b5..130ecdb81 100755 --- a/channels/chan_modem_i4l.c +++ b/channels/chan_modem_i4l.c @@ -18,16 +18,16 @@ #include <errno.h> #include <unistd.h> #include <sys/ioctl.h> -#include <asterisk/lock.h> -#include <asterisk/vmodem.h> -#include <asterisk/module.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/dsp.h> -#include <asterisk/callerid.h> -#include <asterisk/ulaw.h> -#include <asterisk/pbx.h> +#include "asterisk/lock.h" +#include "asterisk/vmodem.h" +#include "asterisk/module.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/dsp.h" +#include "asterisk/callerid.h" +#include "asterisk/ulaw.h" +#include "asterisk/pbx.h" #define STATE_COMMAND 0 #define STATE_VOICE 1 diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 184b694dd..fb5809cc0 100755 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -13,13 +13,13 @@ #include <stdio.h> #include <string.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> +#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" #include <sys/socket.h> #include <sys/time.h> #include <errno.h> diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 6a580d48c..809fdba08 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -15,18 +15,18 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/module.h> -#include <asterisk/options.h> -#include <asterisk/pbx.h> -#include <asterisk/config.h> -#include <asterisk/cli.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/endian.h> +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/endian.h" #include <unistd.h> #include <fcntl.h> #include <errno.h> diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 7208ea09e..20290aba0 100755 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -14,16 +14,16 @@ #include <stdio.h> #include <string.h> #include <ctype.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> -#include <asterisk/utils.h> -#include <asterisk/callerid.h> -#include <asterisk/causes.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" +#include "asterisk/utils.h" +#include "asterisk/callerid.h" +#include "asterisk/causes.h" #include <sys/socket.h> #include <sys/time.h> #include <errno.h> diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4c33cc408..0df1dc7d5 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15,35 +15,35 @@ #include <stdio.h> #include <ctype.h> #include <string.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> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/manager.h> -#include <asterisk/callerid.h> -#include <asterisk/cli.h> -#include <asterisk/app.h> -#include <asterisk/musiconhold.h> -#include <asterisk/dsp.h> -#include <asterisk/features.h> -#include <asterisk/acl.h> -#include <asterisk/srv.h> -#include <asterisk/astdb.h> -#include <asterisk/causes.h> -#include <asterisk/utils.h> -#include <asterisk/file.h> -#include <asterisk/astobj.h> -#include <asterisk/dnsmgr.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" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/manager.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/dsp.h" +#include "asterisk/features.h" +#include "asterisk/acl.h" +#include "asterisk/srv.h" +#include "asterisk/astdb.h" +#include "asterisk/causes.h" +#include "asterisk/utils.h" +#include "asterisk/file.h" +#include "asterisk/astobj.h" +#include "asterisk/dnsmgr.h" #ifdef OSP_SUPPORT -#include <asterisk/astosp.h> +#include "asterisk/astosp.h" #endif #include <sys/socket.h> #include <sys/ioctl.h> diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 677157abf..bbb336c47 100755 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -16,27 +16,27 @@ #include <stdio.h> #include <stdlib.h> #include <string.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> -#include <asterisk/lock.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/rtp.h> -#include <asterisk/acl.h> -#include <asterisk/callerid.h> -#include <asterisk/cli.h> -#include <asterisk/say.h> -#include <asterisk/cdr.h> -#include <asterisk/astdb.h> -#include <asterisk/features.h> -#include <asterisk/app.h> -#include <asterisk/musiconhold.h> -#include <asterisk/utils.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" +#include "asterisk/lock.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/rtp.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/cli.h" +#include "asterisk/say.h" +#include "asterisk/cdr.h" +#include "asterisk/astdb.h" +#include "asterisk/features.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/utils.h" #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> @@ -49,7 +49,7 @@ #include <arpa/inet.h> #include <sys/signal.h> #include <signal.h> -#include <asterisk/dsp.h> +#include "asterisk/dsp.h" #include <ctype.h> /************************************************************************************/ diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c index 7b47772a5..af1199c3b 100755 --- a/channels/chan_vpb.c +++ b/channels/chan_vpb.c @@ -22,17 +22,17 @@ extern "C" { #include <stdio.h> #include <string.h> -#include <asterisk/lock.h> -#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> -#include <asterisk/callerid.h> -#include <asterisk/dsp.h> -#include <asterisk/features.h> +#include "asterisk/lock.h" +#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" +#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 2e18dcbd8..7b41aa2bf 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -13,32 +13,32 @@ #include <stdio.h> #include <string.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> -#include <asterisk/file.h> -#include <asterisk/ulaw.h> -#include <asterisk/alaw.h> -#include <asterisk/callerid.h> -#include <asterisk/adsi.h> -#include <asterisk/cli.h> -#include <asterisk/cdr.h> -#include <asterisk/features.h> -#include <asterisk/musiconhold.h> -#include <asterisk/say.h> -#include <asterisk/tdd.h> -#include <asterisk/app.h> -#include <asterisk/dsp.h> -#include <asterisk/astdb.h> -#include <asterisk/manager.h> -#include <asterisk/causes.h> -#include <asterisk/term.h> -#include <asterisk/utils.h> -#include <asterisk/transcap.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" +#include "asterisk/file.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" +#include "asterisk/callerid.h" +#include "asterisk/adsi.h" +#include "asterisk/cli.h" +#include "asterisk/cdr.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/say.h" +#include "asterisk/tdd.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/astdb.h" +#include "asterisk/manager.h" +#include "asterisk/causes.h" +#include "asterisk/term.h" +#include "asterisk/utils.h" +#include "asterisk/transcap.h" #include <sys/signal.h> #include <errno.h> #include <stdlib.h> @@ -65,7 +65,7 @@ #include <libmfcr2.h> #endif -#include "../asterisk.h" +#include "asterisk.h" #ifndef ZT_SIG_EM_E1 #error "Your zaptel is too old. please cvs update" diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp index a21fc5b54..cf1c33c31 100755 --- a/channels/h323/ast_h323.cpp +++ b/channels/h323/ast_h323.cpp @@ -40,7 +40,7 @@ #ifdef __cplusplus extern "C" { #endif -#include <asterisk/logger.h> +#include "asterisk/logger.h" #ifdef __cplusplus } #endif diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index 61038c338..34b5ae927 100755 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -15,9 +15,9 @@ #include <sys/socket.h> #include <string.h> #include <netinet/in.h> -#include <asterisk/frame.h> -#include <asterisk/utils.h> -#include <asterisk/unaligned.h> +#include "asterisk/frame.h" +#include "asterisk/utils.h" +#include "asterisk/unaligned.h" #include <arpa/inet.h> #include <unistd.h> #include <stdlib.h> diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index dc31e33c8..5feec89a7 100755 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -12,19 +12,19 @@ * */ -#include <asterisk/config.h> -#include <asterisk/logger.h> -#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/config.h" +#include "asterisk/logger.h" +#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 <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <sys/socket.h> -#include <asterisk/utils.h> +#include "asterisk/utils.h" #include <unistd.h> #include <stdlib.h> #include <string.h> diff --git a/chanvars.c b/chanvars.c index 2f23c4dd1..3d768b213 100755 --- a/chanvars.c +++ b/chanvars.c @@ -14,8 +14,8 @@ #include <stdlib.h> #include <string.h> -#include <asterisk/chanvars.h> -#include <asterisk/logger.h> +#include "asterisk/chanvars.h" +#include "asterisk/logger.h" struct ast_var_t *ast_var_assign(const char *name, const char *value) { @@ -13,15 +13,15 @@ #include <unistd.h> #include <stdlib.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/cli.h> -#include <asterisk/module.h> -#include <asterisk/pbx.h> -#include <asterisk/channel.h> -#include <asterisk/manager.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/channel.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include <sys/signal.h> #include <stdio.h> #include <signal.h> diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index 09b8e02bc..772d8eb62 100755 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -10,13 +10,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/logger.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/channel.h> -#include <asterisk/alaw.h> -#include <asterisk/ulaw.h> +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" +#include "asterisk/alaw.h" +#include "asterisk/ulaw.h" #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index 027c64926..8511e7cf4 100755 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -14,13 +14,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/logger.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/translate.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index 1563db3cc..0c99c5638 100755 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -10,14 +10,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/logger.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/translate.h> -#include <asterisk/channel.h> -#include <asterisk/alaw.h> +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" +#include "asterisk/alaw.h" #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c index 48b85e8dd..862443900 100755 --- a/codecs/codec_g723_1.c +++ b/codecs/codec_g723_1.c @@ -22,11 +22,11 @@ #define TYPE_MASK 0x3 #include <sys/types.h> -#include <asterisk/lock.h> -#include <asterisk/translate.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <stdlib.h> #include <unistd.h> diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index f05ba7694..7ba76a98f 100755 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -13,13 +13,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/logger.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/translate.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index bc476a853..d562c6b5f 100755 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -14,13 +14,13 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/translate.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <stdlib.h> #include <unistd.h> diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index 1c7428e8f..503e3c784 100755 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -13,11 +13,11 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/translate.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <stdlib.h> #include <unistd.h> diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index 80821d09e..1e7654863 100755 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -17,13 +17,13 @@ */ -#include <asterisk/lock.h> -#include <asterisk/translate.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <stdlib.h> #include <unistd.h> diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index d59a849b4..d783771b0 100755 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -28,13 +28,13 @@ static int dtx = 0; #define TYPE_LOW 0x1 #define TYPE_MASK 0x3 -#include <asterisk/lock.h> -#include <asterisk/translate.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" #include <fcntl.h> #include <stdlib.h> #include <unistd.h> diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 9dd0e4790..22084822c 100755 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -10,14 +10,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/logger.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/options.h> -#include <asterisk/translate.h> -#include <asterisk/channel.h> -#include <asterisk/ulaw.h> +#include "asterisk/lock.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/channel.h" +#include "asterisk/ulaw.h" #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> @@ -24,14 +24,14 @@ #endif # include <glob.h> #endif -#include <asterisk/config.h> -#include <asterisk/cli.h> -#include <asterisk/lock.h> -#include <asterisk/options.h> -#include <asterisk/logger.h> -#include <asterisk/utils.h> -#include <asterisk/channel.h> -#include <asterisk/app.h> +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/utils.h" +#include "asterisk/channel.h" +#include "asterisk/app.h" #include "asterisk.h" #include "astconf.h" diff --git a/config_old.c b/config_old.c index 9b922025c..c2d8cdf3b 100755 --- a/config_old.c +++ b/config_old.c @@ -16,8 +16,8 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <asterisk/config.h> -#include <asterisk/logger.h> +#include "asterisk/config.h" +#include "asterisk/logger.h" struct ast_config *ast_load(char *configfile) { @@ -23,17 +23,17 @@ #include <errno.h> #include <unistd.h> #include <dirent.h> -#include <asterisk/channel.h> -#include <asterisk/file.h> -#include <asterisk/app.h> -#include <asterisk/dsp.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/astdb.h> -#include <asterisk/cli.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/manager.h> +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/astdb.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/manager.h" #include "db1-ast/include/db.h" #include "asterisk.h" #include "astconf.h" @@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __BSD_VISIBLE #define __BSD_VISIBLE 1 #endif -#include <asterisk/dlfcn-compat.h> +#include "asterisk/dlfcn-compat.h" #ifndef dl_restrict #define dl_restrict __restrict @@ -16,10 +16,10 @@ #include <resolv.h> #include <unistd.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/dns.h> -#include <asterisk/endian.h> +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/dns.h" +#include "asterisk/endian.h" #define MAX_SIZE 4096 @@ -23,14 +23,14 @@ #include <regex.h> #include <signal.h> -#include <asterisk/dnsmgr.h> -#include <asterisk/linkedlists.h> -#include <asterisk/utils.h> -#include <asterisk/config.h> -#include <asterisk/logger.h> -#include <asterisk/sched.h> -#include <asterisk/options.h> -#include <asterisk/cli.h> +#include "asterisk/dnsmgr.h" +#include "asterisk/linkedlists.h" +#include "asterisk/utils.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" #include "asterisk.h" static struct sched_context *sched; @@ -29,12 +29,12 @@ */ #include <sys/types.h> -#include <asterisk/frame.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/dsp.h> -#include <asterisk/ulaw.h> -#include <asterisk/alaw.h> +#include "asterisk/frame.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/dsp.h" +#include "asterisk/ulaw.h" +#include "asterisk/alaw.h" #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -26,13 +26,13 @@ #include <unistd.h> #include <errno.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/enum.h> -#include <asterisk/dns.h> -#include <asterisk/channel.h> -#include <asterisk/config.h> -#include <asterisk/utils.h> +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/enum.h" +#include "asterisk/dns.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" #ifdef __APPLE__ #undef T_NAPTR @@ -12,17 +12,17 @@ */ #include <sys/types.h> -#include <asterisk/frame.h> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/sched.h> -#include <asterisk/options.h> -#include <asterisk/translate.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/app.h> +#include "asterisk/frame.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/translate.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/app.h" #include <errno.h> #include <unistd.h> #include <stdlib.h> diff --git a/formats/format_g723.c b/formats/format_g723.c index 0b061c20f..25e1899fe 100755 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -11,12 +11,12 @@ * the GNU General Public License */ -#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/lock.h" +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/sched.h" +#include "asterisk/module.h" #include <arpa/inet.h> #include <stdlib.h> #include <stdio.h> diff --git a/formats/format_g726.c b/formats/format_g726.c index 0371a7558..67ecaae9e 100755 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -9,14 +9,14 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_g729.c b/formats/format_g729.c index 46fd0953f..597fb78e6 100755 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_gsm.c b/formats/format_gsm.c index c4a63aa68..7011e5da6 100755 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_h263.c b/formats/format_h263.c index a676cf8fb..c5bfd243e 100755 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index c34099461..19ea3de21 100755 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -13,13 +13,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index d750e567e..0e81d890f 100755 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -12,14 +12,14 @@ */ #include <sys/types.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> -#include <asterisk/lock.h> -#include <asterisk/endian.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" +#include "asterisk/lock.h" +#include "asterisk/endian.h" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 79f5f226a..6a0552fe5 100755 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index b5f27be39..9b1e5efae 100755 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_sln.c b/formats/format_sln.c index 4c0b1bc52..d5c562a01 100755 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -9,13 +9,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_vox.c b/formats/format_vox.c index 3413a4aa2..8753c3bdd 100755 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_wav.c b/formats/format_wav.c index 66b82d468..2282aac12 100755 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index fcd4c2ac2..7d8717faa 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -11,13 +11,13 @@ * the GNU General Public License */ -#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> +#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" #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -11,14 +11,14 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/cli.h> -#include <asterisk/term.h> -#include <asterisk/utils.h> +#include "asterisk/lock.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/cli.h" +#include "asterisk/term.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/fskmodem.c b/fskmodem.c index f89e40a84..76cc7b141 100755 --- a/fskmodem.c +++ b/fskmodem.c @@ -14,7 +14,7 @@ * */ -#include <asterisk/fskmodem.h> +#include "asterisk/fskmodem.h" #include <stdio.h> @@ -19,15 +19,15 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include <asterisk/sched.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/file.h> -#include <asterisk/image.h> -#include <asterisk/translate.h> -#include <asterisk/cli.h> -#include <asterisk/lock.h> +#include "asterisk/sched.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/image.h" +#include "asterisk/translate.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" #include "asterisk.h" #include "astconf.h" diff --git a/astconf.h b/include/astconf.h index da3301f6d..da3301f6d 100755 --- a/astconf.h +++ b/include/astconf.h diff --git a/asterisk.h b/include/asterisk.h index 09410fdb6..09410fdb6 100755 --- a/asterisk.h +++ b/include/asterisk.h diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h index 6454b1e3e..100d45ad3 100755 --- a/include/asterisk/acl.h +++ b/include/asterisk/acl.h @@ -20,8 +20,8 @@ extern "C" { #endif #include <netinet/in.h> -#include <asterisk/io.h> -#include <asterisk/astobj.h> +#include "asterisk/io.h" +#include "asterisk/astobj.h" #define AST_SENSE_DENY 0 #define AST_SENSE_ALLOW 1 diff --git a/include/asterisk/adsi.h b/include/asterisk/adsi.h index 085021006..26c2795b3 100755 --- a/include/asterisk/adsi.h +++ b/include/asterisk/adsi.h @@ -16,7 +16,7 @@ #ifndef _ADSI_H #define _ADSI_H -#include <asterisk/callerid.h> +#include "asterisk/callerid.h" /* ADSI Message types */ #define ADSI_MSG_DISPLAY 132 diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h index efb29562d..a4fa3e77a 100755 --- a/include/asterisk/astobj.h +++ b/include/asterisk/astobj.h @@ -15,7 +15,7 @@ #define _ASTERISK_ASTOBJ_H #include <string.h> -#include <asterisk/lock.h> +#include "asterisk/lock.h" /*! \file astobj.h diff --git a/include/asterisk/astosp.h b/include/asterisk/astosp.h index 4a5b59c2e..977933f4e 100755 --- a/include/asterisk/astosp.h +++ b/include/asterisk/astosp.h @@ -13,7 +13,7 @@ #ifndef _ASTERISK_OSP_H #define _ASTERISK_OSP_H -#include <asterisk/channel.h> +#include "asterisk/channel.h" #include <netinet/in.h> #include <time.h> diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h index 7ff6a4281..570bd7569 100755 --- a/include/asterisk/cdr.h +++ b/include/asterisk/cdr.h @@ -17,7 +17,7 @@ #ifndef _CDR_H #define _CDR_H -#include <asterisk/channel.h> +#include "asterisk/channel.h" #include <sys/time.h> #define AST_CDR_FLAG_KEEP_VARS (1 << 0) #define AST_CDR_FLAG_POSTED (1 << 1) diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 4d121bb69..122f46416 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -17,14 +17,14 @@ #ifdef SOLARIS #include <solaris-compat/compat.h> #endif -#include <asterisk/frame.h> -#include <asterisk/sched.h> -#include <asterisk/chanvars.h> +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/chanvars.h" #include <unistd.h> #include <setjmp.h> #if defined(__APPLE__) -#include <asterisk/poll-compat.h> +#include "asterisk/poll-compat.h" #else #include <sys/poll.h> #endif @@ -33,14 +33,14 @@ extern "C" { #endif -#include <asterisk/lock.h> +#include "asterisk/lock.h" /*! Max length of an extension */ #define AST_MAX_EXTENSION 80 -#include <asterisk/cdr.h> -#include <asterisk/monitor.h> -#include <asterisk/utils.h> +#include "asterisk/cdr.h" +#include "asterisk/monitor.h" +#include "asterisk/utils.h" #define AST_CHANNEL_NAME 80 diff --git a/include/asterisk/chanvars.h b/include/asterisk/chanvars.h index f6b4f813d..b03824c4e 100755 --- a/include/asterisk/chanvars.h +++ b/include/asterisk/chanvars.h @@ -14,7 +14,7 @@ #ifndef _ASTERISK_CHANVARS_INCLUDE #define _ASTERISK_CHANVARS_INCLUDE -#include <asterisk/linkedlists.h> +#include "asterisk/linkedlists.h" struct ast_var_t { AST_LIST_ENTRY(ast_var_t) entries; diff --git a/include/asterisk/config.h b/include/asterisk/config.h index d7d9602b6..17fe05ec4 100755 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -36,7 +36,7 @@ struct ast_variable { char stuff[0]; }; -#include <asterisk/config_old.h> +#include "asterisk/config_old.h" typedef struct ast_config *config_load_func(const char *database, const char *table, const char *configfile, struct ast_config *config); typedef struct ast_variable *realtime_var_get(const char *database, const char *table, va_list ap); diff --git a/include/asterisk/crypto.h b/include/asterisk/crypto.h index 13bf0c373..a869de80a 100755 --- a/include/asterisk/crypto.h +++ b/include/asterisk/crypto.h @@ -14,8 +14,8 @@ #ifndef _ASTERISK_CRYPTO_H #define _ASTERISK_CRYPTO_H -#include <asterisk/channel.h> -#include <asterisk/file.h> +#include "asterisk/channel.h" +#include "asterisk/file.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/include/asterisk/cvsid.h b/include/asterisk/cvsid.h index ce6b84aed..4ac5b2a08 100755 --- a/include/asterisk/cvsid.h +++ b/include/asterisk/cvsid.h @@ -35,7 +35,7 @@ /* * To use this macro, in the source file put the lines: * - * #include <asterisk/cvsid.h> + * #include "asterisk/cvsid.h" * #ifndef lint * CVSID("$Id$"); * #endif diff --git a/include/asterisk/dundi.h b/include/asterisk/dundi.h index e7820691f..080b9da75 100755 --- a/include/asterisk/dundi.h +++ b/include/asterisk/dundi.h @@ -11,7 +11,7 @@ #ifndef _ASTERISK_DUNDI_H #define _ASTERISK_DUNDI_H -#include <asterisk/channel.h> +#include "asterisk/channel.h" #define DUNDI_PORT 4520 diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h index d2d8a134b..15c059836 100755 --- a/include/asterisk/enum.h +++ b/include/asterisk/enum.h @@ -17,7 +17,7 @@ #ifndef _ASTERISK_ENUM_H #define _ASTERISK_ENUM_H -#include <asterisk/channel.h> +#include "asterisk/channel.h" /*! \brief Lookup entry in ENUM Returns 1 if found, 0 if not found, -1 on hangup \param chan Channel \param number Number in E164 format without the + (for e164.arpa) or format diff --git a/include/asterisk/file.h b/include/asterisk/file.h index 30600bab5..3ca59e625 100755 --- a/include/asterisk/file.h +++ b/include/asterisk/file.h @@ -14,8 +14,8 @@ #ifndef _ASTERISK_FILE_H #define _ASTERISK_FILE_H -#include <asterisk/channel.h> -#include <asterisk/frame.h> +#include "asterisk/channel.h" +#include "asterisk/frame.h" #include <fcntl.h> diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index a90d2bbb6..5ca3376ce 100755 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -22,7 +22,7 @@ extern "C" { #include <sys/types.h> #include <sys/time.h> -#include <asterisk/endian.h> +#include "asterisk/endian.h" struct ast_codec_pref { char order[32]; diff --git a/include/asterisk/indications.h b/include/asterisk/indications.h index 9b8ebca5c..2aec759d2 100755 --- a/include/asterisk/indications.h +++ b/include/asterisk/indications.h @@ -22,7 +22,7 @@ #ifndef _ASTERISK_INDICATIONS_H #define _ASTERISK_INDICATIONS_H -#include <asterisk/lock.h> +#include "asterisk/lock.h" /* forward reference */ struct ast_channel; diff --git a/include/asterisk/io.h b/include/asterisk/io.h index f841c3c06..2973c5c69 100755 --- a/include/asterisk/io.h +++ b/include/asterisk/io.h @@ -15,7 +15,7 @@ #define _IO_H #ifdef __APPLE__ -#include <asterisk/poll-compat.h> +#include "asterisk/poll-compat.h" #else #include <sys/poll.h> /* For POLL* constants */ #endif diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index edf3e164e..75623561b 100755 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -1,7 +1,7 @@ #ifndef ASTERISK_LINKEDLISTS_H #define ASTERISK_LINKEDLISTS_H -#include <asterisk/lock.h> +#include "asterisk/lock.h" /*! \file linkedlists.h diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 2c33d54f0..62454255d 100755 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -23,7 +23,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <asterisk/lock.h> +#include "asterisk/lock.h" /*! \file manager.h diff --git a/include/asterisk/monitor.h b/include/asterisk/monitor.h index 3561197d4..62439cad0 100755 --- a/include/asterisk/monitor.h +++ b/include/asterisk/monitor.h @@ -3,7 +3,7 @@ #include <stdio.h> -#include <asterisk/channel.h> +#include "asterisk/channel.h" struct ast_channel; diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 265993d7d..4c9677639 100755 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -13,8 +13,8 @@ #ifndef _ASTERISK_PBX_H #define _ASTERISK_PBX_H -#include <asterisk/sched.h> -#include <asterisk/channel.h> +#include "asterisk/sched.h" +#include "asterisk/channel.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index c2a6d5472..4053cd0b5 100755 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -14,10 +14,10 @@ #ifndef _ASTERISK_RTP_H #define _ASTERISK_RTP_H -#include <asterisk/frame.h> -#include <asterisk/io.h> -#include <asterisk/sched.h> -#include <asterisk/channel.h> +#include "asterisk/frame.h" +#include "asterisk/io.h" +#include "asterisk/sched.h" +#include "asterisk/channel.h" #include <netinet/in.h> diff --git a/include/asterisk/say.h b/include/asterisk/say.h index 52197d4ea..436281c5d 100755 --- a/include/asterisk/say.h +++ b/include/asterisk/say.h @@ -14,8 +14,8 @@ #ifndef _ASTERISK_SAY_H #define _ASTERISK_SAY_H -#include <asterisk/channel.h> -#include <asterisk/file.h> +#include "asterisk/channel.h" +#include "asterisk/file.h" #include <time.h> diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h index b33cec629..507682ab5 100755 --- a/include/asterisk/translate.h +++ b/include/asterisk/translate.h @@ -20,8 +20,8 @@ extern "C" { #endif -#include <asterisk/frame.h> -#include <asterisk/plc.h> +#include "asterisk/frame.h" +#include "asterisk/plc.h" /* Declared by individual translators */ struct ast_translator_pvt; diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index b1b71d73e..226e230ce 100755 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -18,7 +18,7 @@ #include <netinet/in.h> #include <netdb.h> #include <pthread.h> -#include <asterisk/lock.h> +#include "asterisk/lock.h" #include <limits.h> /* Note: diff --git a/include/asterisk/vmodem.h b/include/asterisk/vmodem.h index e45b981cd..1711f4c18 100755 --- a/include/asterisk/vmodem.h +++ b/include/asterisk/vmodem.h @@ -14,8 +14,8 @@ #ifndef _ASTERISK_VMODEM_H #define _ASTERISK_VMODEM_H -#include <asterisk/frame.h> -#include <asterisk/channel.h> +#include "asterisk/frame.h" +#include "asterisk/channel.h" #define CHAR_DLE 0x10 #define CHAR_ETX 0x03 diff --git a/indications.c b/indications.c index 51e5f209b..0f93e458c 100755 --- a/indications.c +++ b/indications.c @@ -20,13 +20,13 @@ #include <stdlib.h> #include <string.h> #include <math.h> /* For PI */ -#include <asterisk/indications.h> -#include <asterisk/frame.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> +#include "asterisk/indications.h" +#include "asterisk/frame.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" struct playtones_item { int freq1; @@ -17,8 +17,8 @@ #include <termios.h> #include <string.h> /* for memset */ #include <sys/ioctl.h> -#include <asterisk/io.h> -#include <asterisk/logger.h> +#include "asterisk/io.h" +#include "asterisk/logger.h" #ifdef DEBUG_IO #define DEBUG DEBUG_M @@ -16,22 +16,22 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> -#include <asterisk/module.h> -#include <asterisk/options.h> -#include <asterisk/config.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/term.h> -#include <asterisk/manager.h> -#include <asterisk/enum.h> -#include <asterisk/rtp.h> -#include <asterisk/lock.h> +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/enum.h" +#include "asterisk/rtp.h" +#include "asterisk/lock.h" #ifdef __APPLE__ -#include <asterisk/dlfcn-compat.h> +#include "asterisk/dlfcn-compat.h" #else #include <dlfcn.h> #endif -#include <asterisk/md5.h> +#include "asterisk/md5.h" #include "asterisk.h" #include "astconf.h" @@ -16,14 +16,14 @@ #include <stdio.h> #include <unistd.h> #include <time.h> -#include <asterisk/lock.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/config.h> -#include <asterisk/term.h> -#include <asterisk/cli.h> -#include <asterisk/utils.h> -#include <asterisk/manager.h> +#include "asterisk/lock.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/term.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" +#include "asterisk/manager.h" #include <string.h> #include <stdlib.h> #include <errno.h> @@ -45,7 +45,7 @@ static int syslog_level_map[] = { #define SYSLOG_NLEVELS 6 -#include <asterisk/logger.h> +#include "asterisk/logger.h" #define MAX_MSG_QUEUE 200 @@ -26,20 +26,21 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include <asterisk/channel.h> -#include <asterisk/file.h> -#include <asterisk/manager.h> -#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> -#include <asterisk/pbx.h> -#include <asterisk/md5.h> -#include <asterisk/acl.h> -#include <asterisk/utils.h> + +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/manager.h" +#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" +#include "asterisk/pbx.h" +#include "asterisk/md5.h" +#include "asterisk/acl.h" +#include "asterisk/utils.h" struct fast_originate_helper { @@ -18,8 +18,8 @@ * will fill a supplied 16-byte array with the digest. */ #include <string.h> /* for memcpy() */ -#include <asterisk/endian.h> -#include <asterisk/md5.h> +#include "asterisk/endian.h" +#include "asterisk/md5.h" # if __BYTE_ORDER == __BIG_ENDIAN # define HIGHFIRST 1 @@ -13,25 +13,25 @@ #include <sys/types.h> #include <regex.h> -#include <asterisk/lock.h> -#include <asterisk/cli.h> -#include <asterisk/pbx.h> -#include <asterisk/channel.h> -#include <asterisk/options.h> -#include <asterisk/logger.h> -#include <asterisk/file.h> -#include <asterisk/callerid.h> -#include <asterisk/cdr.h> -#include <asterisk/config.h> -#include <asterisk/term.h> -#include <asterisk/manager.h> -#include <asterisk/ast_expr.h> -#include <asterisk/linkedlists.h> -#include <asterisk/say.h> -#include <asterisk/utils.h> -#include <asterisk/causes.h> -#include <asterisk/musiconhold.h> -#include <asterisk/app.h> +#include "asterisk/lock.h" +#include "asterisk/cli.h" +#include "asterisk/pbx.h" +#include "asterisk/channel.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/file.h" +#include "asterisk/callerid.h" +#include "asterisk/cdr.h" +#include "asterisk/config.h" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/ast_expr.h" +#include "asterisk/linkedlists.h" +#include "asterisk/say.h" +#include "asterisk/utils.h" +#include "asterisk/causes.h" +#include "asterisk/musiconhold.h" +#include "asterisk/app.h" #include <string.h> #include <unistd.h> #include <stdlib.h> diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index ff6f2fe82..41d97d2ad 100755 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -13,15 +13,15 @@ #include <sys/socket.h> #include <string.h> #include <netinet/in.h> -#include <asterisk/frame.h> -#include <asterisk/utils.h> +#include "asterisk/frame.h" +#include "asterisk/utils.h" #include <arpa/inet.h> #include <unistd.h> #include <stdlib.h> #include <stdio.h> -#include <asterisk/dundi.h> +#include "asterisk/dundi.h" #include "dundi-parser.h" -#include <asterisk/dundi.h> +#include "asterisk/dundi.h" static void internaloutput(const char *str) { diff --git a/pbx/dundi-parser.h b/pbx/dundi-parser.h index cc2364f51..3ea701e5b 100755 --- a/pbx/dundi-parser.h +++ b/pbx/dundi-parser.h @@ -12,8 +12,8 @@ #ifndef _DUNDI_PARSER_H #define _DUNDI_PARSER_H -#include <asterisk/dundi.h> -#include <asterisk/aes.h> +#include "asterisk/dundi.h" +#include "asterisk/aes.h" #define DUNDI_MAX_STACK 512 #define DUNDI_MAX_ANSWERS 100 diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index a0e1d9ec1..83488437e 100755 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -12,20 +12,20 @@ */ #include <sys/types.h> -#include <asterisk/pbx.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/cli.h> -#include <asterisk/callerid.h> +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/cli.h" +#include "asterisk/callerid.h" #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> #include <errno.h> /* For where to put dynamic tables */ -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #ifdef __AST_DEBUG_MALLOC static void FREE(void *ptr) diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 1c198c0e4..b80867b29 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -9,26 +9,26 @@ * of the GNU General Public License. */ -#include <asterisk/file.h> -#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> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/lock.h> -#include <asterisk/md5.h> -#include <asterisk/dundi.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/utils.h> -#include <asterisk/crypto.h> -#include <asterisk/astdb.h> -#include <asterisk/acl.h> -#include <asterisk/aes.h> +#include "asterisk/file.h" +#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" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/md5.h" +#include "asterisk/dundi.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/utils.h" +#include "asterisk/crypto.h" +#include "asterisk/astdb.h" +#include "asterisk/acl.h" +#include "asterisk/aes.h" #include "dundi-parser.h" #include <stdlib.h> diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index ce8189a6a..9394b641c 100755 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -20,13 +20,13 @@ */ #include <sys/types.h> -#include <asterisk/pbx.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/cli.h> -#include <asterisk/utils.h> +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" #include <stdlib.h> #include <fcntl.h> #include <unistd.h> @@ -39,8 +39,8 @@ #include <gtk/gtk.h> #include <glib.h> /* For where to put dynamic tables */ -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" AST_MUTEX_DEFINE_STATIC(verb_lock); diff --git a/pbx/pbx_kdeconsole_main.cc b/pbx/pbx_kdeconsole_main.cc index 9f43ee88f..0bb2d73e2 100755 --- a/pbx/pbx_kdeconsole_main.cc +++ b/pbx/pbx_kdeconsole_main.cc @@ -11,10 +11,10 @@ * the GNU General Public License */ -#include <asterisk/module.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/lock.h> +#include "asterisk/module.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/lock.h" #include "pbx_kdeconsole.h" static char *dtext = "KDE Console Monitor"; diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index d6f35c6da..8fb7b3f7e 100755 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -9,25 +9,25 @@ * of the GNU General Public License. */ -#include <asterisk/file.h> -#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> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/lock.h> -#include <asterisk/md5.h> -#include <asterisk/linkedlists.h> -#include <asterisk/chanvars.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/utils.h> -#include <asterisk/crypto.h> -#include <asterisk/astdb.h> +#include "asterisk/file.h" +#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" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/md5.h" +#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/utils.h" +#include "asterisk/crypto.h" +#include "asterisk/astdb.h" #include <stdlib.h> #include <unistd.h> diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 2d5eeacc9..8574a6675 100755 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -9,27 +9,27 @@ * of the GNU General Public License. */ -#include <asterisk/file.h> -#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> -#include <asterisk/term.h> -#include <asterisk/manager.h> -#include <asterisk/file.h> -#include <asterisk/cli.h> -#include <asterisk/lock.h> -#include <asterisk/md5.h> -#include <asterisk/linkedlists.h> -#include <asterisk/chanvars.h> -#include <asterisk/sched.h> -#include <asterisk/io.h> -#include <asterisk/utils.h> -#include <asterisk/crypto.h> -#include <asterisk/astdb.h> +#include "asterisk/file.h" +#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" +#include "asterisk/term.h" +#include "asterisk/manager.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/lock.h" +#include "asterisk/md5.h" +#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/utils.h" +#include "asterisk/crypto.h" +#include "asterisk/astdb.h" #include <stdlib.h> #include <unistd.h> diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index 0abf97042..4551c0cf8 100755 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/callerid.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/options.h> -#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" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include <sys/stat.h> #include <errno.h> #include <time.h> @@ -31,7 +31,7 @@ #include <string.h> #include <stdio.h> #include <unistd.h> -#include "../astconf.h" +#include "astconf.h" /* * pbx_spool is similar in spirit to qcall, but with substantially enhanced functionality... diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c index 632c79fa8..5b86ba5bb 100755 --- a/pbx/pbx_wilcalu.c +++ b/pbx/pbx_wilcalu.c @@ -17,22 +17,22 @@ * "tech/tele,filename&" ie. "tor1/23,file&" */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/options.h> -#include <asterisk/utils.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" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #include <unistd.h> #include <string.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include <errno.h> -#include "../astconf.h" +#include "astconf.h" /* Globals */ @@ -35,7 +35,7 @@ #include <math.h> #include <limits.h> -#include <asterisk/plc.h> +#include "asterisk/plc.h" #if !defined(FALSE) #define FALSE 0 @@ -77,7 +77,7 @@ #include <assert.h> /* assertion macros */ #include <string.h> /* string functions */ -#include <asterisk/poll-compat.h> /* this package */ +#include "asterisk/poll-compat.h" /* this package */ /*---------------------------------------------------------------------------*\ Macros @@ -19,17 +19,18 @@ #include <errno.h> #include <unistd.h> #include <dirent.h> -#include <asterisk/channel.h> -#include <asterisk/file.h> -#include <asterisk/app.h> -#include <asterisk/dsp.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/astdb.h> -#include <asterisk/callerid.h> -#include <asterisk/privacy.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> + +#include "asterisk/channel.h" +#include "asterisk/file.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/astdb.h" +#include "asterisk/callerid.h" +#include "asterisk/privacy.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" #include "asterisk.h" int ast_privacy_check(char *dest, char *cid) diff --git a/res/res_adsi.c b/res/res_adsi.c index a957f546d..82c05073a 100755 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -21,16 +21,16 @@ #include <unistd.h> #include <math.h> #include <errno.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/adsi.h> -#include <asterisk/module.h> -#include <asterisk/config.h> -#include <asterisk/file.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/adsi.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/file.h" #define DEFAULT_ADSI_MAX_RETRIES 3 diff --git a/res/res_agi.c b/res/res_agi.c index 7c7f6e3d9..d9b650dc2 100755 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -17,13 +17,13 @@ #include <netinet/in.h> #include <netinet/tcp.h> #include <arpa/inet.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/astdb.h> -#include <asterisk/callerid.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/astdb.h" +#include "asterisk/callerid.h" #include <math.h> #include <stdlib.h> #include <unistd.h> @@ -34,22 +34,22 @@ #include <stdio.h> #include <fcntl.h> #include <errno.h> -#include <asterisk/cli.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/image.h> -#include <asterisk/say.h> -#include <asterisk/app.h> -#include <asterisk/dsp.h> -#include <asterisk/musiconhold.h> -#include <asterisk/manager.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/agi.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk/cli.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/image.h" +#include "asterisk/say.h" +#include "asterisk/app.h" +#include "asterisk/dsp.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/agi.h" +#include "asterisk.h" +#include "astconf.h" #ifdef SOLARIS -#include <asterisk/astmm.h> +#include "asterisk/astmm.h" #endif #define MAX_ARGS 128 diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 7e1d146d5..4a1080a3c 100755 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -9,19 +9,19 @@ * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com> */ -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/config.h> -#include <asterisk/module.h> -#include <asterisk/lock.h> -#include <asterisk/options.h> +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/lock.h" +#include "asterisk/options.h" #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/res_odbc.h> -#include <asterisk/utils.h> +#include "asterisk/res_odbc.h" +#include "asterisk/utils.h" static char *tdesc = "ODBC Configuration"; STANDARD_LOCAL_USER; diff --git a/res/res_crypto.c b/res/res_crypto.c index 9f58394f6..13e4c2dbc 100755 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -12,18 +12,18 @@ */ #include <sys/types.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> -#include <asterisk/crypto.h> -#include <asterisk/md5.h> -#include <asterisk/cli.h> -#include <asterisk/io.h> -#include <asterisk/lock.h> -#include <asterisk/utils.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" +#include "asterisk/crypto.h" +#include "asterisk/md5.h" +#include "asterisk/cli.h" +#include "asterisk/io.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" #include <openssl/ssl.h> #include <openssl/err.h> #include <stdio.h> @@ -32,8 +32,8 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" /* * Asterisk uses RSA keys with SHA-1 message digests for its diff --git a/res/res_features.c b/res/res_features.c index 508a2e690..b177549d9 100755 --- a/res/res_features.c +++ b/res/res_features.c @@ -11,23 +11,23 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <asterisk/options.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/app.h> -#include <asterisk/say.h> -#include <asterisk/features.h> -#include <asterisk/musiconhold.h> -#include <asterisk/config.h> -#include <asterisk/cli.h> -#include <asterisk/manager.h> -#include <asterisk/utils.h> -#include <asterisk/adsi.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/app.h" +#include "asterisk/say.h" +#include "asterisk/features.h" +#include "asterisk/musiconhold.h" +#include "asterisk/config.h" +#include "asterisk/cli.h" +#include "asterisk/manager.h" +#include "asterisk/utils.h" +#include "asterisk/adsi.h" #include <pthread.h> #include <stdlib.h> #include <errno.h> diff --git a/res/res_indications.c b/res/res_indications.c index cc744ec55..0b6d74f2a 100755 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -21,16 +21,16 @@ #include <errno.h> #include <sys/types.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> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/indications.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" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/indications.h" /* Globals */ diff --git a/res/res_monitor.c b/res/res_monitor.c index 905e681b4..b77514520 100755 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -6,20 +6,20 @@ #include <sys/stat.h> #include <libgen.h> /* dirname() */ -#include <asterisk/lock.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/file.h> -#include <asterisk/pbx.h> -#include <asterisk/module.h> -#include <asterisk/manager.h> -#include <asterisk/cli.h> -#include <asterisk/monitor.h> -#include <asterisk/app.h> -#include <asterisk/utils.h> -#include <asterisk/config.h> -#include "../asterisk.h" -#include "../astconf.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" +#include "asterisk/manager.h" +#include "asterisk/cli.h" +#include "asterisk/monitor.h" +#include "asterisk/app.h" +#include "asterisk/utils.h" +#include "asterisk/config.h" +#include "asterisk.h" +#include "astconf.h" #define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 6ba33b3ca..df018b429 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -11,21 +11,21 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/file.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/pbx.h> -#include <../astconf.h> -#include <asterisk/options.h> -#include <asterisk/module.h> -#include <asterisk/translate.h> -#include <asterisk/say.h> -#include <asterisk/musiconhold.h> -#include <asterisk/config.h> -#include <asterisk/utils.h> +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "astconf.h" +#include "asterisk/options.h" +#include "asterisk/module.h" +#include "asterisk/translate.h" +#include "asterisk/say.h" +#include "asterisk/musiconhold.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" #include <stdlib.h> -#include <asterisk/cli.h> +#include "asterisk/cli.h" #include <errno.h> #include <unistd.h> #include <string.h> diff --git a/res/res_odbc.c b/res/res_odbc.c index c8408177b..c4955980d 100755 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -9,19 +9,19 @@ * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct@yahoo.com> */ -#include <asterisk/file.h> -#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/cli.h> -#include <asterisk/lock.h> +#include "asterisk/file.h" +#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/cli.h" +#include "asterisk/lock.h" #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <asterisk/res_odbc.h> +#include "asterisk/res_odbc.h" #define MAX_ODBC_HANDLES 25 struct odbc_list diff --git a/res/res_osp.c b/res/res_osp.c index bcf7bef9c..570df78b1 100755 --- a/res/res_osp.c +++ b/res/res_osp.c @@ -13,23 +13,23 @@ #include <sys/types.h> #include <osp.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> -#include <asterisk/crypto.h> -#include <asterisk/md5.h> -#include <asterisk/cli.h> -#include <asterisk/io.h> -#include <asterisk/lock.h> -#include <asterisk/astosp.h> -#include <asterisk/config.h> -#include <asterisk/utils.h> -#include <asterisk/lock.h> -#include <asterisk/causes.h> -#include <asterisk/callerid.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" +#include "asterisk/crypto.h" +#include "asterisk/md5.h" +#include "asterisk/cli.h" +#include "asterisk/io.h" +#include "asterisk/lock.h" +#include "asterisk/astosp.h" +#include "asterisk/config.h" +#include "asterisk/utils.h" +#include "asterisk/lock.h" +#include "asterisk/causes.h" +#include "asterisk/callerid.h" #include <openssl/err.h> #include <stdio.h> #include <dirent.h> @@ -37,8 +37,8 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> -#include "../asterisk.h" -#include "../astconf.h" +#include "asterisk.h" +#include "astconf.h" #include <openssl/bio.h> #include <openssl/pem.h> #include <openssl/evp.h> @@ -26,18 +26,18 @@ #include <arpa/inet.h> #include <fcntl.h> -#include <asterisk/rtp.h> -#include <asterisk/frame.h> -#include <asterisk/logger.h> -#include <asterisk/options.h> -#include <asterisk/channel.h> -#include <asterisk/acl.h> -#include <asterisk/channel.h> -#include <asterisk/config.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> -#include <asterisk/cli.h> -#include <asterisk/unaligned.h> +#include "asterisk/rtp.h" +#include "asterisk/frame.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/channel.h" +#include "asterisk/acl.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/cli.h" +#include "asterisk/unaligned.h" #define MAX_TIMESTAMP_SKEW 640 @@ -21,13 +21,13 @@ #include <time.h> #include <ctype.h> #include <math.h> -#include <asterisk/file.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/say.h> -#include <asterisk/lock.h> -#include <asterisk/localtime.h> -#include <asterisk/utils.h> +#include "asterisk/file.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/say.h" +#include "asterisk/lock.h" +#include "asterisk/localtime.h" +#include "asterisk/utils.h" #include "asterisk.h" #include <stdio.h> @@ -23,10 +23,10 @@ #include <unistd.h> #include <string.h> -#include <asterisk/sched.h> -#include <asterisk/logger.h> -#include <asterisk/channel.h> -#include <asterisk/lock.h> +#include "asterisk/sched.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/lock.h" /* Determine if a is sooner than b */ #define SOONER(a,b) (((b).tv_sec > (a).tv_sec) || \ @@ -22,12 +22,12 @@ #include <string.h> #include <unistd.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/srv.h> -#include <asterisk/dns.h> -#include <asterisk/options.h> -#include <asterisk/utils.h> +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/srv.h" +#include "asterisk/dns.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" #ifdef __APPLE__ #undef T_SRV diff --git a/stdtime/localtime.c b/stdtime/localtime.c index 7adaabf1d..2a82da949 100755 --- a/stdtime/localtime.c +++ b/stdtime/localtime.c @@ -26,8 +26,8 @@ #endif #define TZ_STRLEN_MAX 255 /* #define DEBUG */ -#include <asterisk/lock.h> -#include <asterisk/localtime.h> +#include "asterisk/lock.h" +#include "asterisk/localtime.h" #ifndef lint @@ -21,10 +21,10 @@ #include <unistd.h> #include <math.h> #include <ctype.h> -#include <asterisk/ulaw.h> -#include <asterisk/tdd.h> -#include <asterisk/logger.h> -#include <asterisk/fskmodem.h> +#include "asterisk/ulaw.h" +#include "asterisk/tdd.h" +#include "asterisk/logger.h" +#include "asterisk/fskmodem.h" #include "ecdisa.h" @@ -21,9 +21,9 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include <asterisk/term.h> -#include <asterisk/options.h> -#include <asterisk/lock.h> +#include "asterisk/term.h" +#include "asterisk/options.h" +#include "asterisk/lock.h" #include "asterisk.h" static int vt100compat = 0; diff --git a/translate.c b/translate.c index b1c7162a3..97ece832a 100755 --- a/translate.c +++ b/translate.c @@ -11,15 +11,15 @@ * the GNU General Public License */ -#include <asterisk/lock.h> -#include <asterisk/channel.h> -#include <asterisk/logger.h> -#include <asterisk/translate.h> -#include <asterisk/options.h> -#include <asterisk/frame.h> -#include <asterisk/sched.h> -#include <asterisk/cli.h> -#include <asterisk/term.h> +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/logger.h" +#include "asterisk/translate.h" +#include "asterisk/options.h" +#include "asterisk/frame.h" +#include "asterisk/sched.h" +#include "asterisk/cli.h" +#include "asterisk/term.h" #include <sys/socket.h> #include <sys/time.h> #include <unistd.h> @@ -11,7 +11,7 @@ * the GNU General Public License */ -#include <asterisk/ulaw.h> +#include "asterisk/ulaw.h" #define ZEROTRAP /* turn on the trap as per the MIL-STD */ #define BIAS 0x84 /* define the add-in bias for 16 bit samples */ @@ -22,11 +22,11 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <asterisk/lock.h> -#include <asterisk/utils.h> -#include <asterisk/io.h> -#include <asterisk/logger.h> -#include <asterisk/md5.h> +#include "asterisk/lock.h" +#include "asterisk/utils.h" +#include "asterisk/io.h" +#include "asterisk/logger.h" +#include "asterisk/md5.h" static char base64[64]; static char b2a[256]; diff --git a/utils/astman.c b/utils/astman.c index 036111a80..9e68a3b1e 100755 --- a/utils/astman.c +++ b/utils/astman.c @@ -20,8 +20,8 @@ #include <unistd.h> #include <stdlib.h> -#include <asterisk/md5.h> -#include <asterisk/manager.h> +#include "asterisk/md5.h" +#include "asterisk/manager.h" #undef gethostbyname |