move asterisk/paths.h outside asterisk.h and into those files

who really need it.

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

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index d2e288d4779a8d7d8d5dcb33a968727f0910ce1a..9997ae9318e0900fcd26eef4afd1819976b120f4 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -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"

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 37cb3e5fd3693f45d4c43032602f432085dfcd80..e41614343bb823e41523fe965d05a12853b06c24 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -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"

diff --git a/apps/app_dial.c b/apps/app_dial.c
index dfaa6822dadbf5a87954b0a37846e95d6c931806..57756e5b0ede550d9e409aac7de311423371b82d 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -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"

diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index a5e27c7eba232058016b3e506bc0f01bb76f8e92..65625b87fe5a6aa09803b195ebd12e467501c2b0 100644 (file)
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -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"

diff --git a/apps/app_directory.c b/apps/app_directory.c
index 41252692c34564660c410657252aa468dc2ab109..233b40495f6f9e828a6557807ad154aa4c55974a 100644 (file)
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -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"

diff --git a/apps/app_followme.c b/apps/app_followme.c
index 57f440b3116c98e3f955096087adf2d1470e8756..48677d6bdd69d540c78a3d7c6c1c5d7fd5a5f3e6 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -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"

diff --git a/apps/app_ices.c b/apps/app_ices.c
index 6f6c54b3981e05c3710f43e395adff90e3238cfa..0c00178e059eb9b4e292335f6949b78269b0b866 100644 (file)
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -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"

diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index a33415fe8e0ddf23a380a71d6598f1a12a992e77..94fb1f62dcdf365cccf9dba771543495bbbcaef0 100644 (file)
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -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"

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 775c4fc6870c5dba221515e93485af9d2bec61c8..1ce333bf98e130244ef6bb0e222229c8c073c273 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -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"

diff --git a/apps/app_sms.c b/apps/app_sms.c
index 8a986a2e9f951f1f977ed3c9e5439028c1a866d5..80fdf9f81e4d63838c5ef22b325c844da4b207ce 100644 (file)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -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"

diff --git a/apps/app_test.c b/apps/app_test.c
index 3853bc3221a10baf6810563b54a41c832c492518..89853cb6b61366a5fcf196f4b10415e40959fc9a 100644 (file)
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -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"

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 0287b665793176bf4b174ad25fc488a531972781..297fd25d2ebd096ad37e531f5000912e7126b721 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -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>

diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 06e03c9722ba85b55f9c869226c75237808a40ba..2feda2fd25774c5dae601214a04a674b5ca54792 100644 (file)
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -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"

diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index dab0a1b9f05ea27177b2ffe9246a8868b2bc3b26..fbfb8d52794570044e4ef0deb26d361c1a3af9a8 100644 (file)
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -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"

diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 780b252fffabb35b1adf3971d91ce4230dee573f..11316c59feeb98c22ee82706902cf3a42cbf8312 100644 (file)
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -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"

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 42b8997147d8a079e254c4edb1fd0f37f4b864fe..0bd4cd09b64687003dee7db3950e55cc6bbc66a6 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -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" 

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b2b8c4b7c73c08d3fcd2add08137a7c4ce8576e5..93fc84e05c546444f352e69762457569857c9214 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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"

diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 7cd9aab46631538f2895e77628fb438cecc558c9..898026e48cec64db1b6c860cd5c30cba3cd7d238 100644 (file)
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -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"

diff --git a/include/asterisk.h b/include/asterisk.h
index 5605d2f3bae006ebae2c6befefc1621a800674d2..cb8499c3cf03d9d28ec6a1a15d0a8b4cc180a605 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -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

diff --git a/include/asterisk/ael_structs.h b/include/asterisk/ael_structs.h
index 133c4266ab58b834fa88380dd3d57ddec0aee34b..fa551bf91a0793490e3550870f76ad7712299679 100644 (file)
--- a/include/asterisk/ael_structs.h
+++ b/include/asterisk/ael_structs.h
@@ -25,6 +25,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"
 
 #if !defined(SOLARIS) && !defined(__CYGWIN__)

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index f16c6f0b9ed1a59ac6e4e2618c7b7a54985fadae..b79c0c29c2d3e0cdc96e0c0b20d3510db095a906 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -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
 

diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 19ae6e9b14e7682b4ea1ef76fb95cc0e08338be0..8a3225a16c1756f32091dc9ebfefa76644987274 100644 (file)
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -29,6 +29,10 @@
 #include <inttypes.h>
 #endif
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/include/asterisk/paths.h b/include/asterisk/paths.h
index 4c80c3199c98a6f7874aa437b5eab8d627e3bc0f..f539c078e4962b65225d88207ad00298e8783fac 100644 (file)
--- a/include/asterisk/paths.h
+++ b/include/asterisk/paths.h
@@ -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];

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 6b55a4272b920b859175034f8ad7e7d60e682bc2..a9c8d5f0c512944de6faca2f4f746685bf7bac2f 100644 (file)
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -25,7 +25,6 @@
 
 #include "asterisk/network.h"
 
-#include <limits.h>
 #include <time.h>      /* we want to override localtime_r */
 
 #include "asterisk/lock.h"

diff --git a/main/app.c b/main/app.c
index 2326cba07d2e78391afac5f1841512fb96b53e9e..4441932cad9c5d00116f1d35896a29028d7418fc 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -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"

diff --git a/main/channel.c b/main/channel.c
index 1fcc096bbc5e014465994365615f3131a96eabe9..d8524f5e9b61e2bc737525a05f8758e29ef6d045 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -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"

diff --git a/main/cli.c b/main/cli.c
index b4c4b5fd261fd7a820adfe59c1593694a0a89771..c53fcbe1883dde127390c989e0fde74710a8165e 100644 (file)
--- a/main/cli.c
+++ b/main/cli.c
@@ -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>

diff --git a/main/config.c b/main/config.c
index a0c15dce2426cdd9864697c41f58bb33631f1415..b07c809d5021100fdcc58f6ce5ecddbb7c050fa0 100644 (file)
--- a/main/config.c
+++ b/main/config.c
@@ -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>

diff --git a/main/db.c b/main/db.c
index aea825d1a0ca0824c91371bacd0b24540012fc3d..ab4bddac91f02e5ffb1f0f216808ff5546ec219b 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>

diff --git a/main/file.c b/main/file.c
index ddedf8aee4009c98e16c6fc3b776c201d9fd79a8..42879819c47ba95038be3f9c2c4c6b3fff390ef2 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -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"

diff --git a/main/http.c b/main/http.c
index d9d670e7ab0db80dd9a395df0fe617ff0d244777..c552bce3595568f207cd28845c962357ee35e16f 100644 (file)
--- a/main/http.c
+++ b/main/http.c
@@ -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>

diff --git a/main/image.c b/main/image.c
index 539f1f8ec6b5b286b2f615e70e9e942d039893f1..1e763ed5e8758326dbe4460a789d48235a2f1e92 100644 (file)
--- a/main/image.c
+++ b/main/image.c
@@ -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"

diff --git a/main/loader.c b/main/loader.c
index 3ffa68758b484e54a573a8d387e0f9f5feb70b9e..dcf8854f29c4b3a2e482d751d0ae0b8441db1455 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -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"

diff --git a/main/logger.c b/main/logger.c
index c94cf4b44201e004bc369732f0f18c283d4d1666..3f7634b2adc51346e13bfeaff59698382fb52982 100644 (file)
--- a/main/logger.c
+++ b/main/logger.c
@@ -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>

diff --git a/main/manager.c b/main/manager.c
index 14a9d9881fce69633cedda62e50725b96e85c681..26cb9e7deadaa972dc8e7a1f3c9439fa370ca728 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -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>

diff --git a/main/pbx.c b/main/pbx.c
index d1a0570c7cfd624d9bc37b1982f8267f46adf61d..62994c7f8b5e0198918c0bd18c5f7f39962465b7 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -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

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 42e60af7702bd9bbc2eb37364a198d6c47ba13c0..442d3e1d533bd6b81cf7186fca8faf33f72cebf6 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -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"

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 31726526add6254576f66596dbe2b24b6c99a43d..9b64df721a95210577983848d29e22428c6e700a 100644 (file)
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -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"

diff --git a/res/res_agi.c b/res/res_agi.c
index d8df0791b738be376ad6531eec354c318fc681f0..cbb8d982339516f7492ef2bd73a23033437738c7 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -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"

diff --git a/res/res_crypto.c b/res/res_crypto.c
index a5782f9f090893825a88ba97c115ff7098be1b08..6903c388c7c1dd1689a998fea1fbdafaeeef20b6 100644 (file)
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -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>

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 4a401a411dc85c34cfbf7a107330f2dc2e23ca5e..33906ef010d0122275633d54f9b2c4a29552e8b7 100644 (file)
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -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"