[Asterisk-cvs] asterisk/res res_adsi.c, 1.12, 1.13 res_agi.c, 1.32, 1.33 res_config_odbc.c, 1.24, 1.25 res_crypto.c, 1.19, 1.20 res_features.c, 1.47, 1.48 res_indications.c, 1.10, 1.11 res_monitor.c, 1.31, 1.32 res_musiconhold.c, 1.57, 1.58 res_odbc.c, 1.13, 1.14 res_osp.c, 1.12, 1.13

kpfleming at lists.digium.com kpfleming at lists.digium.com
Thu Apr 21 01:12:05 CDT 2005


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

Modified Files:
	res_adsi.c res_agi.c res_config_odbc.c res_crypto.c 
	res_features.c res_indications.c res_monitor.c 
	res_musiconhold.c res_odbc.c res_osp.c 
Log Message:
use double-quotes instead of angle-brackets for non-system include files (bug #4058)


Index: res_adsi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_adsi.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- res_adsi.c	6 Apr 2005 05:11:48 -0000	1.12
+++ res_adsi.c	21 Apr 2005 06:02:44 -0000	1.13
@@ -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
 

Index: res_agi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_agi.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- res_agi.c	11 Apr 2005 03:23:54 -0000	1.32
+++ res_agi.c	21 Apr 2005 06:02:44 -0000	1.33
@@ -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

Index: res_config_odbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_config_odbc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- res_config_odbc.c	17 Feb 2005 16:31:08 -0000	1.24
+++ res_config_odbc.c	21 Apr 2005 06:02:44 -0000	1.25
@@ -9,19 +9,19 @@
  * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct at 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;

Index: res_crypto.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_crypto.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- res_crypto.c	21 Jan 2005 07:06:25 -0000	1.19
+++ res_crypto.c	21 Apr 2005 06:02:44 -0000	1.20
@@ -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

Index: res_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- res_features.c	20 Apr 2005 16:27:44 -0000	1.47
+++ res_features.c	21 Apr 2005 06:02:44 -0000	1.48
@@ -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>

Index: res_indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_indications.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- res_indications.c	25 Jan 2005 06:10:20 -0000	1.10
+++ res_indications.c	21 Apr 2005 06:02:44 -0000	1.11
@@ -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 */

Index: res_monitor.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- res_monitor.c	17 Feb 2005 23:08:34 -0000	1.31
+++ res_monitor.c	21 Apr 2005 06:02:44 -0000	1.32
@@ -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"
 

Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- res_musiconhold.c	13 Apr 2005 04:47:39 -0000	1.57
+++ res_musiconhold.c	21 Apr 2005 06:02:44 -0000	1.58
@@ -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>

Index: res_odbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_odbc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- res_odbc.c	23 Mar 2005 05:56:32 -0000	1.13
+++ res_odbc.c	21 Apr 2005 06:02:44 -0000	1.14
@@ -9,19 +9,19 @@
  * Copyright (C) 2004 - 2005 Anthony Minessale II <anthmct at 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

Index: res_osp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_osp.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- res_osp.c	25 Jan 2005 06:10:20 -0000	1.12
+++ res_osp.c	21 Apr 2005 06:02:44 -0000	1.13
@@ -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>




More information about the svn-commits mailing list