use double-quotes instead of angle-brackets for non-system include files (bug #4058)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5490 f38db490-d61c-443f-a65b-d21fe96a405b

27 files changed, 133 insertions, 42 deletions

diff --git a/include/astconf.h b/include/astconf.h
new file mode 100755
index 000000000..da3301f6d
--- /dev/null
+++ b/include/astconf.h
@@ -0,0 +1,32 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * General Definitions for Asterisk top level program
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#ifndef _ASTCONF_H
+#define _ASTCONF_H
+
+#define AST_CONFIG_MAX_PATH 255
+
+extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_CONFIG_FILE[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_MODULE_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_KEY_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_PID[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_SOCKET[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_RUN_DIR[AST_CONFIG_MAX_PATH];
+
+#endif
diff --git a/include/asterisk.h b/include/asterisk.h
new file mode 100755
index 000000000..09410fdb6
--- /dev/null
+++ b/include/asterisk.h
@@ -0,0 +1,59 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * General Definitions for Asterisk top level program
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#ifndef _ASTERISK_H
+#define _ASTERISK_H
+
+#define DEFAULT_LANGUAGE "en"
+
+#define AST_CONFIG_MAX_PATH 255
+#define AST_CONFIG_DIR 	ASTETCDIR
+#define AST_RUN_DIR	ASTVARRUNDIR
+#define AST_SOCKET	ASTVARRUNDIR "/asterisk.ctl"
+#define AST_PID		ASTVARRUNDIR "/asterisk.pid"
+#define AST_MODULE_DIR 	ASTMODDIR
+#define AST_SPOOL_DIR  	ASTSPOOLDIR
+#define AST_VAR_DIR    	ASTVARLIBDIR
+#define AST_LOG_DIR	ASTLOGDIR
+#define AST_AGI_DIR	ASTAGIDIR
+#define AST_KEY_DIR	ASTVARLIBDIR "/keys"
+#define AST_DB		ASTVARLIBDIR "/astdb"
+#define AST_TMP_DIR	ASTSPOOLDIR "/tmp"
+
+#define AST_CONFIG_FILE ASTCONFPATH
+
+#define AST_SOUNDS AST_VAR_DIR "/sounds"
+#define AST_IMAGES AST_VAR_DIR "/images"
+
+/* Provided by module.c */
+extern int load_modules(void);
+/* Provided by pbx.c */
+extern int load_pbx(void);
+/* Provided by logger.c */
+extern int init_logger(void);
+extern void close_logger(void);
+/* Provided by frame.c */
+extern int init_framer(void);
+/* Provided by logger.c */
+extern int reload_logger(int);
+/* Provided by term.c */
+extern int term_init(void);
+/* Provided by db.c */
+extern int astdb_init(void);
+/* Provided by channel.c */
+extern void ast_channels_init(void);
+/* Provided by dnsmgr.c */
+extern int dnsmgr_init(void);
+extern void dnsmgr_reload(void);
+
+#endif
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