mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-27 16:07:15 -07:00
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
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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__)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIMITS_H
|
||||
#include <limits.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
#include "asterisk/network.h"
|
||||
|
||||
#include <limits.h>
|
||||
#include <time.h> /* we want to override localtime_r */
|
||||
|
||||
#include "asterisk/lock.h"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user