diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/astconf.h | 32 | ||||
| -rwxr-xr-x | include/asterisk.h | 30 |
2 files changed, 14 insertions, 48 deletions
diff --git a/include/astconf.h b/include/astconf.h deleted file mode 100755 index da3301f6d..000000000 --- a/include/astconf.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 index 09410fdb6..b4b26a775 100755 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -17,23 +17,21 @@ #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 in asterisk.c */ +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_MONITOR_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]; /* Provided by module.c */ extern int load_modules(void); |