[asterisk-commits] rizzo: trunk r89466 - in /trunk: apps/ cdr/ channels/ include/ include/asteri...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Nov 20 17:16:16 CST 2007


Author: rizzo
Date: Tue Nov 20 17:16:15 2007
New Revision: 89466

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89466
Log:
move asterisk/paths.h outside asterisk.h and into those files
who really need it.


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

Modified: trunk/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_adsiprog.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_adsiprog.c (original)
+++ trunk/apps/app_adsiprog.c Tue Nov 20 17:16:15 2007
@@ -36,6 +36,7 @@
 #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"

Modified: trunk/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_chanspy.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_chanspy.c (original)
+++ trunk/apps/app_chanspy.c Tue Nov 20 17:16:15 2007
@@ -33,6 +33,7 @@
 
 #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"

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Tue Nov 20 17:16:15 2007
@@ -34,6 +34,7 @@
 #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"

Modified: trunk/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dictate.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_dictate.c (original)
+++ trunk/apps/app_dictate.c Tue Nov 20 17:16:15 2007
@@ -33,6 +33,7 @@
 
 #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"

Modified: trunk/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_directory.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_directory.c (original)
+++ trunk/apps/app_directory.c Tue Nov 20 17:16:15 2007
@@ -31,6 +31,7 @@
 
 #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"

Modified: trunk/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_followme.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Tue Nov 20 17:16:15 2007
@@ -34,6 +34,7 @@
 
 #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"

Modified: trunk/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_ices.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_ices.c (original)
+++ trunk/apps/app_ices.c Tue Nov 20 17:16:15 2007
@@ -35,6 +35,7 @@
 #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"

Modified: trunk/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_minivm.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_minivm.c (original)
+++ trunk/apps/app_minivm.c Tue Nov 20 17:16:15 2007
@@ -154,6 +154,7 @@
 #include <locale.h>
 
 
+#include "asterisk/paths.h"	/* use various paths */
 #include "asterisk/astobj.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"

Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Tue Nov 20 17:16:15 2007
@@ -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"

Modified: trunk/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_sms.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_sms.c (original)
+++ trunk/apps/app_sms.c Tue Nov 20 17:16:15 2007
@@ -42,6 +42,7 @@
 #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"

Modified: trunk/apps/app_test.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_test.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_test.c (original)
+++ trunk/apps/app_test.c Tue Nov 20 17:16:15 2007
@@ -34,6 +34,7 @@
 #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"

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Nov 20 17:16:15 2007
@@ -65,6 +65,7 @@
 
 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>

Modified: trunk/cdr/cdr_csv.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_csv.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/cdr/cdr_csv.c (original)
+++ trunk/cdr/cdr_csv.c Tue Nov 20 17:16:15 2007
@@ -34,6 +34,7 @@
 
 #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"

Modified: trunk/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_custom.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/cdr/cdr_custom.c (original)
+++ trunk/cdr/cdr_custom.c Tue Nov 20 17:16:15 2007
@@ -36,6 +36,7 @@
 
 #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"

Modified: trunk/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_sqlite3_custom.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/cdr/cdr_sqlite3_custom.c (original)
+++ trunk/cdr/cdr_sqlite3_custom.c Tue Nov 20 17:16:15 2007
@@ -43,6 +43,7 @@
 #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"

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Nov 20 17:16:15 2007
@@ -54,6 +54,7 @@
 #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" 

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Nov 20 17:16:15 2007
@@ -95,6 +95,7 @@
 #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"

Modified: trunk/channels/chan_unistim.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/channels/chan_unistim.c (original)
+++ trunk/channels/chan_unistim.c Tue Nov 20 17:16:15 2007
@@ -50,6 +50,7 @@
 #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"

Modified: trunk/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk.h?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Tue Nov 20 17:16:15 2007
@@ -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

Modified: trunk/include/asterisk/ael_structs.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/ael_structs.h?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/include/asterisk/ael_structs.h (original)
+++ trunk/include/asterisk/ael_structs.h Tue Nov 20 17:16:15 2007
@@ -24,6 +24,12 @@
 
 #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"
 

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Tue Nov 20 17:16:15 2007
@@ -150,7 +150,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/stringfields.h"
-#include <limits.h>
 
 #define DATASTORE_INHERIT_FOREVER	INT_MAX
 

Modified: trunk/include/asterisk/compat.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/compat.h?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/include/asterisk/compat.h (original)
+++ trunk/include/asterisk/compat.h Tue Nov 20 17:16:15 2007
@@ -27,6 +27,10 @@
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
 #endif
 
 #ifdef HAVE_UNISTD_H

Modified: trunk/include/asterisk/paths.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/paths.h?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/include/asterisk/paths.h (original)
+++ trunk/include/asterisk/paths.h Tue Nov 20 17:16:15 2007
@@ -17,8 +17,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];

Modified: trunk/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/utils.h?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/include/asterisk/utils.h (original)
+++ trunk/include/asterisk/utils.h Tue Nov 20 17:16:15 2007
@@ -25,7 +25,6 @@
 
 #include "asterisk/network.h"
 
-#include <limits.h>
 #include <time.h>	/* we want to override localtime_r */
 
 #include "asterisk/lock.h"

Modified: trunk/main/app.c
URL: http://svn.digium.com/view/asterisk/trunk/main/app.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Tue Nov 20 17:16:15 2007
@@ -35,6 +35,7 @@
 #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"

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Nov 20 17:16:15 2007
@@ -33,6 +33,7 @@
 #include <signal.h>
 #include <math.h>
 
+#include "asterisk/paths.h"	/* use ast_config_AST_SYSTEM_NAME */
 #include "asterisk/zapata.h"
 
 #include "asterisk/pbx.h"

Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/main/db.c
URL: http://svn.digium.com/view/asterisk/trunk/main/db.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/db.c (original)
+++ trunk/main/db.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Tue Nov 20 17:16:15 2007
@@ -31,6 +31,7 @@
 #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"

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/main/image.c
URL: http://svn.digium.com/view/asterisk/trunk/main/image.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/image.c (original)
+++ trunk/main/image.c Tue Nov 20 17:16:15 2007
@@ -31,6 +31,7 @@
 #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"

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Tue Nov 20 17:16:15 2007
@@ -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"

Modified: trunk/main/logger.c
URL: http://svn.digium.com/view/asterisk/trunk/main/logger.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue Nov 20 17:16:15 2007
@@ -28,10 +28,10 @@
 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

Modified: trunk/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_config.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Tue Nov 20 17:16:15 2007
@@ -29,6 +29,7 @@
 
 #include <ctype.h>
 
+#include "asterisk/paths.h"	/* ast_config_AST_CONFIG_DIR */
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"

Modified: trunk/pbx/pbx_spool.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_spool.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/pbx/pbx_spool.c (original)
+++ trunk/pbx/pbx_spool.c Tue Nov 20 17:16:15 2007
@@ -31,6 +31,7 @@
 #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"

Modified: trunk/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_agi.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Tue Nov 20 17:16:15 2007
@@ -34,6 +34,7 @@
 #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"

Modified: trunk/res/res_crypto.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_crypto.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/res/res_crypto.c (original)
+++ trunk/res/res_crypto.c Tue Nov 20 17:16:15 2007
@@ -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>

Modified: trunk/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_monitor.c?view=diff&rev=89466&r1=89465&r2=89466
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Tue Nov 20 17:16:15 2007
@@ -30,6 +30,7 @@
 #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"




More information about the asterisk-commits mailing list