move asterisk/paths.h outside asterisk.h and into those files
authorLuigi Rizzo <rizzo@icir.org>
Tue, 20 Nov 2007 23:16:15 +0000 (23:16 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Tue, 20 Nov 2007 23:16:15 +0000 (23:16 +0000)
who really need it.

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

41 files changed:
apps/app_adsiprog.c
apps/app_chanspy.c
apps/app_dial.c
apps/app_dictate.c
apps/app_directory.c
apps/app_followme.c
apps/app_ices.c
apps/app_minivm.c
apps/app_mixmonitor.c
apps/app_sms.c
apps/app_test.c
apps/app_voicemail.c
cdr/cdr_csv.c
cdr/cdr_custom.c
cdr/cdr_sqlite3_custom.c
channels/chan_iax2.c
channels/chan_sip.c
channels/chan_unistim.c
include/asterisk.h
include/asterisk/ael_structs.h
include/asterisk/channel.h
include/asterisk/compat.h
include/asterisk/paths.h
include/asterisk/utils.h
main/app.c
main/channel.c
main/cli.c
main/config.c
main/db.c
main/file.c
main/http.c
main/image.c
main/loader.c
main/logger.c
main/manager.c
main/pbx.c
pbx/pbx_config.c
pbx/pbx_spool.c
res/res_agi.c
res/res_crypto.c
res/res_monitor.c

index d2e288d..9997ae9 100644 (file)
@@ -36,6 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <ctype.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_CONFIG_DIR */
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
index 37cb3e5..e416143 100644 (file)
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_MONITOR_DIR */
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
index dfaa682..57756e5 100644 (file)
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 #include <netinet/in.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_DATA_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
index a5e27c7..65625b8 100644 (file)
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/stat.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR */
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
index 4125269..233b404 100644 (file)
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
index 57f440b..48677d6 100644 (file)
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <signal.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
index 6f6c54b..0c00178 100644 (file)
@@ -35,6 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 #include <sys/time.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_CONFIG_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
index a33415f..94fb1f6 100644 (file)
@@ -154,6 +154,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <locale.h>
 
 
+#include "asterisk/paths.h"    /* use various paths */
 #include "asterisk/astobj.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
index 775c4fc..1ce333b 100644 (file)
@@ -37,6 +37,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/paths.h"    /* use ast_config_AST_MONITOR_DIR */
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
index 8a986a2..80fdf9f 100644 (file)
@@ -42,6 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <sys/stat.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR and LOG_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/options.h"
index 3853bc3..89853cb 100644 (file)
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
index 0287b66..297fd25 100644 (file)
@@ -65,6 +65,7 @@ c-client (http://www.washington.edu/imap/
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR */
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
index 06e03c9..2feda2f 100644 (file)
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <time.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
index dab0a1b..fbfb8d5 100644 (file)
@@ -36,6 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <time.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
index 780b252..11316c5 100644 (file)
@@ -43,6 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <time.h>
 #include <sqlite3.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
index 42b8997..0bd4cd0 100644 (file)
@@ -54,6 +54,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <regex.h>
 
 #include "asterisk/zapata.h"
+#include "asterisk/paths.h"    /* need ast_config_AST_DATA_DIR for firmware */
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h" 
index b2b8c4b..93fc84e 100644 (file)
@@ -95,6 +95,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <regex.h>
 
 #include "asterisk/network.h"
+#include "asterisk/paths.h"    /* need ast_config_AST_SYSTEM_NAME */
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
index 7cd9aab..898026e 100644 (file)
@@ -50,6 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <arpa/inet.h>
 #include <ctype.h>
 
+#include "asterisk/paths.h"    /* ast_config_AST_LOG_DIR used in (too ?) many places */
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
index 5605d2f..cb8499c 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "asterisk/compat.h"
 
-#include "asterisk/paths.h"
 #include "asterisk/logger.h"
 
 /* Default to allowing the umask or filesystem ACLs to determine actual file
index 133c426..fa551bf 100644 (file)
 #ifndef _ASTERISK_AEL_STRUCTS_H
 #define _ASTERISK_AEL_STRUCTS_H
 
+/*
+ * We include asterisk/paths.h here because it is a convenient place
+ * that doesn't require us to rebuild ael files from .fl/.y
+ */
+#include "asterisk/paths.h"
+
 #include "pval.h"
 
 #if !defined(SOLARIS) && !defined(__CYGWIN__)
index f16c6f0..b79c0c2 100644 (file)
@@ -150,7 +150,6 @@ extern "C" {
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/stringfields.h"
-#include <limits.h>
 
 #define DATASTORE_INHERIT_FOREVER      INT_MAX
 
index 19ae6e9..8a3225a 100644 (file)
 #include <inttypes.h>
 #endif
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index 4c80c31..f539c07 100644 (file)
@@ -18,8 +18,6 @@
 #ifndef _ASTERISK_PATHS_H
 #define _ASTERISK_PATHS_H
 
-#include <limits.h>
-
 extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
 extern char ast_config_AST_CONFIG_FILE[PATH_MAX];
 extern char ast_config_AST_MODULE_DIR[PATH_MAX];
index 6b55a42..a9c8d5f 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "asterisk/network.h"
 
-#include <limits.h>
 #include <time.h>      /* we want to override localtime_r */
 
 #include "asterisk/lock.h"
index 2326cba..4441932 100644 (file)
@@ -35,6 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <regex.h>
 #include <fcntl.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_DATA_DIR */
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/file.h"
index 1fcc096..d8524f5 100644 (file)
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <math.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SYSTEM_NAME */
 #include "asterisk/zapata.h"
 
 #include "asterisk/pbx.h"
index b4c4b5f..c53fcbe 100644 (file)
@@ -28,6 +28,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use ast_config_AST_MODULE_DIR */
 #include <sys/signal.h>
 #include <signal.h>
 #include <ctype.h>
index a0c15dc..b07c809 100644 (file)
@@ -30,6 +30,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/paths.h"    /* use ast_config_AST_CONFIG_DIR */
 #include "asterisk/network.h"  /* we do some sockaddr manipulation here */
 #include <time.h>
 #include <sys/stat.h>
index aea825d..ab4bdda 100644 (file)
--- a/main/db.c
+++ b/main/db.c
@@ -32,6 +32,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use ast_config_AST_DB */
 #include <sys/time.h>
 #include <signal.h>
 #include <dirent.h>
index ddedf8a..4287981 100644 (file)
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <dirent.h>
 #include <sys/stat.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_DATA_DIR */
 #include "asterisk/frame.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
index d9d670e..c552bce 100644 (file)
@@ -32,6 +32,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/paths.h"    /* use ast_config_AST_DATA_DIR */
 #include "asterisk/network.h"
 #include <time.h>
 #include <sys/time.h>
index 539f1f8..1e763ed 100644 (file)
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 #include <signal.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_DATA_DIR */
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
index 3ffa687..dcf8854 100644 (file)
@@ -32,6 +32,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use ast_config_AST_MODULE_DIR */
 #include <dirent.h>
 
 #include "asterisk/linkedlists.h"
index c94cf4b..3f7634b 100644 (file)
@@ -36,6 +36,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include <signal.h>
 #include <time.h>
 #include <sys/stat.h>
index 14a9d98..26cb9e7 100644 (file)
@@ -46,6 +46,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use various ast_config_AST_* */
 #include <ctype.h>
 #include <sys/time.h>
 #include <signal.h>
index d1a0570..62994c7 100644 (file)
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use ast_config_AST_SYSTEM_NAME */
 #include <ctype.h>
 #include <time.h>
 #include <sys/time.h>
-#include <limits.h>
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
index 42e60af..442d3e1 100644 (file)
@@ -29,6 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
 
+#include "asterisk/paths.h"    /* ast_config_AST_CONFIG_DIR */
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"
index 3172652..9b64df7 100644 (file)
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <utime.h>
 #include <dirent.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_SPOOL_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
index d8df079..cbb8d98 100644 (file)
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/wait.h>
 #include <sys/stat.h>
 
+#include "asterisk/paths.h"    /* use many ast_config_AST_*_DIR */
 #include "asterisk/network.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
index a5782f9..6903c38 100644 (file)
@@ -34,6 +34,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/paths.h"    /* use ast_config_AST_KEY_DIR */
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <dirent.h>
index 4a401a4..33906ef 100644 (file)
@@ -30,6 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 #include <libgen.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_MONITOR_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"