[Asterisk-cvs] asterisk acl.c, 1.39, 1.40 aesopt.h, 1.9, 1.10 alaw.c, 1.1, 1.2 app.c, 1.55, 1.56 ast_expr.y, 1.14, 1.15 asterisk.c, 1.148, 1.149 astmm.c, 1.12, 1.13 autoservice.c, 1.9, 1.10 callerid.c, 1.29, 1.30 cdr.c, 1.33, 1.34 channel.c, 1.188, 1.189 chanvars.c, 1.6, 1.7 cli.c, 1.76, 1.77 config.c, 1.59, 1.60 config_old.c, 1.1, 1.2 db.c, 1.14, 1.15 dlfcn.c, 1.2, 1.3 dns.c, 1.12, 1.13 dnsmgr.c, 1.3, 1.4 dsp.c, 1.38, 1.39 enum.c, 1.24, 1.25 file.c, 1.60, 1.61 frame.c, 1.50, 1.51 fskmodem.c, 1.3, 1.4 image.c, 1.11, 1.12 indications.c, 1.22, 1.23 io.c, 1.7, 1.8 loader.c, 1.38, 1.39 logger.c, 1.64, 1.65 manager.c, 1.92, 1.93 md5.c, 1.11, 1.12 pbx.c, 1.227, 1.228 plc.c, 1.3, 1.4 poll.c, 1.1, 1.2 privacy.c, 1.3, 1.4 rtp.c, 1.123, 1.124 say.c, 1.55, 1.56 sched.c, 1.17, 1.18 srv.c, 1.11, 1.12 tdd.c, 1.3, 1.4 term.c, 1.7, 1.8 translate.c, 1.33, 1.34 ulaw.c, 1.2, 1.3 utils.c, 1.37, 1.38 astconf.h, 1.1, NONE asterisk.h, 1.15, NONE

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv6707

Modified Files:
	acl.c aesopt.h alaw.c app.c ast_expr.y asterisk.c astmm.c 
	autoservice.c callerid.c cdr.c channel.c chanvars.c cli.c 
	config.c config_old.c db.c dlfcn.c dns.c dnsmgr.c dsp.c enum.c 
	file.c frame.c fskmodem.c image.c indications.c io.c loader.c 
	logger.c manager.c md5.c pbx.c plc.c poll.c privacy.c rtp.c 
	say.c sched.c srv.c tdd.c term.c translate.c ulaw.c utils.c 
Removed Files:
	astconf.h asterisk.h 
Log Message:
use double-quotes instead of angle-brackets for non-system include files (bug #4058)


Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- acl.c	9 Mar 2005 05:48:11 -0000	1.39
+++ acl.c	21 Apr 2005 06:02:43 -0000	1.40
@@ -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>

Index: aesopt.h
===================================================================
RCS file: /usr/cvsroot/asterisk/aesopt.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- aesopt.h	29 Mar 2005 04:49:24 -0000	1.9
+++ aesopt.h	21 Apr 2005 06:02:43 -0000	1.10
@@ -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
 

Index: alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/alaw.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- alaw.c	9 Dec 2001 00:41:43 -0000	1.1
+++ alaw.c	21 Apr 2005 06:02:43 -0000	1.2
@@ -11,7 +11,7 @@
  * the GNU General Public License
  */
 
-#include <asterisk/alaw.h>
+#include "asterisk/alaw.h"
 
 #define AMI_MASK 0x55
 

Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- app.c	13 Apr 2005 23:33:47 -0000	1.55
+++ app.c	21 Apr 2005 06:02:43 -0000	1.56
@@ -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"
 

Index: ast_expr.y
===================================================================
RCS file: /usr/cvsroot/asterisk/ast_expr.y,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ast_expr.y	3 Apr 2005 21:16:00 -0000	1.14
+++ ast_expr.y	21 Apr 2005 06:02:43 -0000	1.15
@@ -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

Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- asterisk.c	13 Apr 2005 04:47:38 -0000	1.148
+++ asterisk.c	21 Apr 2005 06:02:43 -0000	1.149
@@ -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>

Index: astmm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/astmm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- astmm.c	23 Mar 2005 05:56:31 -0000	1.12
+++ astmm.c	21 Apr 2005 06:02:43 -0000	1.13
@@ -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
 

Index: autoservice.c
===================================================================
RCS file: /usr/cvsroot/asterisk/autoservice.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- autoservice.c	4 Mar 2005 06:47:23 -0000	1.9
+++ autoservice.c	21 Apr 2005 06:02:43 -0000	1.10
@@ -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
 

Index: callerid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/callerid.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- callerid.c	26 Feb 2005 07:34:09 -0000	1.29
+++ callerid.c	21 Apr 2005 06:02:43 -0000	1.30
@@ -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;

Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- cdr.c	13 Apr 2005 23:33:47 -0000	1.33
+++ cdr.c	21 Apr 2005 06:02:43 -0000	1.34
@@ -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>

Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- channel.c	18 Apr 2005 16:26:41 -0000	1.188
+++ channel.c	21 Apr 2005 06:02:43 -0000	1.189
@@ -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__

Index: chanvars.c
===================================================================
RCS file: /usr/cvsroot/asterisk/chanvars.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- chanvars.c	1 Nov 2004 15:48:42 -0000	1.6
+++ chanvars.c	21 Apr 2005 06:02:43 -0000	1.7
@@ -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)
 {

Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- cli.c	23 Mar 2005 05:56:31 -0000	1.76
+++ cli.c	21 Apr 2005 06:02:43 -0000	1.77
@@ -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>

Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- config.c	17 Mar 2005 00:35:06 -0000	1.59
+++ config.c	21 Apr 2005 06:02:43 -0000	1.60
@@ -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"
 

Index: config_old.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config_old.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config_old.c	25 Jan 2005 06:11:11 -0000	1.1
+++ config_old.c	21 Apr 2005 06:02:43 -0000	1.2
@@ -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)
 {

Index: db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/db.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- db.c	23 Feb 2005 22:58:11 -0000	1.14
+++ db.c	21 Apr 2005 06:02:43 -0000	1.15
@@ -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"

Index: dlfcn.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dlfcn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dlfcn.c	16 Feb 2005 02:58:17 -0000	1.2
+++ dlfcn.c	21 Apr 2005 06:02:43 -0000	1.3
@@ -47,7 +47,7 @@
 #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

Index: dns.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dns.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dns.c	29 Mar 2005 04:49:24 -0000	1.12
+++ dns.c	21 Apr 2005 06:02:43 -0000	1.13
@@ -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
 

Index: dnsmgr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dnsmgr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dnsmgr.c	12 Apr 2005 14:11:59 -0000	1.3
+++ dnsmgr.c	21 Apr 2005 06:02:43 -0000	1.4
@@ -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;

Index: dsp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dsp.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dsp.c	4 Mar 2005 06:47:23 -0000	1.38
+++ dsp.c	21 Apr 2005 06:02:43 -0000	1.39
@@ -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>

Index: enum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/enum.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- enum.c	12 Mar 2005 16:58:04 -0000	1.24
+++ enum.c	21 Apr 2005 06:02:43 -0000	1.25
@@ -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

Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- file.c	7 Apr 2005 19:25:52 -0000	1.60
+++ file.c	21 Apr 2005 06:02:43 -0000	1.61
@@ -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>

Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- frame.c	4 Apr 2005 02:13:40 -0000	1.50
+++ frame.c	21 Apr 2005 06:02:43 -0000	1.51
@@ -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>

Index: fskmodem.c
===================================================================
RCS file: /usr/cvsroot/asterisk/fskmodem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fskmodem.c	19 Sep 2004 16:17:17 -0000	1.3
+++ fskmodem.c	21 Apr 2005 06:02:43 -0000	1.4
@@ -14,7 +14,7 @@
  *
  */
 
-#include <asterisk/fskmodem.h>
+#include "asterisk/fskmodem.h"
 
 #include <stdio.h>
 

Index: image.c
===================================================================
RCS file: /usr/cvsroot/asterisk/image.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- image.c	4 Mar 2005 06:47:23 -0000	1.11
+++ image.c	21 Apr 2005 06:02:43 -0000	1.12
@@ -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"
 

Index: indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/indications.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- indications.c	16 Feb 2005 02:58:17 -0000	1.22
+++ indications.c	21 Apr 2005 06:02:43 -0000	1.23
@@ -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;

Index: io.c
===================================================================
RCS file: /usr/cvsroot/asterisk/io.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- io.c	26 Oct 2003 18:50:49 -0000	1.7
+++ io.c	21 Apr 2005 06:02:43 -0000	1.8
@@ -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

Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- loader.c	6 Apr 2005 21:12:32 -0000	1.38
+++ loader.c	21 Apr 2005 06:02:43 -0000	1.39
@@ -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"
 

Index: logger.c
===================================================================
RCS file: /usr/cvsroot/asterisk/logger.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- logger.c	3 Apr 2005 21:25:45 -0000	1.64
+++ logger.c	21 Apr 2005 06:02:43 -0000	1.65
@@ -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 @@
 
 #define SYSLOG_NLEVELS 6
 
-#include <asterisk/logger.h>
+#include "asterisk/logger.h"
 
 #define MAX_MSG_QUEUE 200
 

Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- manager.c	13 Apr 2005 23:33:47 -0000	1.92
+++ manager.c	21 Apr 2005 06:02:43 -0000	1.93
@@ -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
 {

Index: md5.c
===================================================================
RCS file: /usr/cvsroot/asterisk/md5.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- md5.c	10 Apr 2005 21:43:03 -0000	1.11
+++ md5.c	21 Apr 2005 06:02:43 -0000	1.12
@@ -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

Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- pbx.c	20 Apr 2005 16:11:16 -0000	1.227
+++ pbx.c	21 Apr 2005 06:02:43 -0000	1.228
@@ -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>

Index: plc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/plc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plc.c	20 Mar 2005 02:53:48 -0000	1.3
+++ plc.c	21 Apr 2005 06:02:43 -0000	1.4
@@ -35,7 +35,7 @@
 #include <math.h>
 #include <limits.h>
 
-#include <asterisk/plc.h>
+#include "asterisk/plc.h"
 
 #if !defined(FALSE)
 #define FALSE 0

Index: poll.c
===================================================================
RCS file: /usr/cvsroot/asterisk/poll.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poll.c	26 Oct 2003 19:17:28 -0000	1.1
+++ poll.c	21 Apr 2005 06:02:43 -0000	1.2
@@ -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

Index: privacy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/privacy.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- privacy.c	22 Jun 2004 18:48:59 -0000	1.3
+++ privacy.c	21 Apr 2005 06:02:43 -0000	1.4
@@ -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)

Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- rtp.c	20 Apr 2005 16:46:25 -0000	1.123
+++ rtp.c	21 Apr 2005 06:02:43 -0000	1.124
@@ -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
 

Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- say.c	13 Apr 2005 05:07:47 -0000	1.55
+++ say.c	21 Apr 2005 06:02:43 -0000	1.56
@@ -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>
 

Index: sched.c
===================================================================
RCS file: /usr/cvsroot/asterisk/sched.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sched.c	15 Apr 2005 17:34:14 -0000	1.17
+++ sched.c	21 Apr 2005 06:02:43 -0000	1.18
@@ -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) || \

Index: srv.c
===================================================================
RCS file: /usr/cvsroot/asterisk/srv.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- srv.c	17 Jul 2004 22:06:26 -0000	1.11
+++ srv.c	21 Apr 2005 06:02:43 -0000	1.12
@@ -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

Index: tdd.c
===================================================================
RCS file: /usr/cvsroot/asterisk/tdd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tdd.c	28 Mar 2005 20:48:24 -0000	1.3
+++ tdd.c	21 Apr 2005 06:02:43 -0000	1.4
@@ -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"
 
 

Index: term.c
===================================================================
RCS file: /usr/cvsroot/asterisk/term.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- term.c	1 Oct 2004 03:11:52 -0000	1.7
+++ term.c	21 Apr 2005 06:02:43 -0000	1.8
@@ -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;

Index: translate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/translate.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- translate.c	4 Apr 2005 03:28:38 -0000	1.33
+++ translate.c	21 Apr 2005 06:02:43 -0000	1.34
@@ -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>

Index: ulaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/ulaw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ulaw.c	7 Dec 2001 22:57:34 -0000	1.2
+++ ulaw.c	21 Apr 2005 06:02:43 -0000	1.3
@@ -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 */

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- utils.c	6 Apr 2005 21:12:32 -0000	1.37
+++ utils.c	21 Apr 2005 06:02:43 -0000	1.38
@@ -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];

--- astconf.h DELETED ---

--- asterisk.h DELETED ---