From: Luigi Rizzo <rizzo@icir.org>
Date: Fri, 16 Nov 2007 23:28:28 +0000 (+0000)
Subject: paths are already in include/asterisk/paths.h so don't duplicate
X-Git-Tag: 1.6.0-beta1~3^2~837
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b523bf89659515455fa588362bf289024027077;p=thirdparty%2Fasterisk.git

paths are already in include/asterisk/paths.h so don't duplicate
them in include/asterisk.h



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

diff --git a/include/asterisk.h b/include/asterisk.h
index 4468754d24..9881711e11 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -48,29 +48,6 @@
 #define	setpriority	__PLEASE_USE_ast_set_priority_INSTEAD_OF_setpriority__
 #define	sched_setscheduler	__PLEASE_USE_ast_set_priority_INSTEAD_OF_sched_setscheduler__
 
-/* provided in asterisk.c */
-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];
-extern char ast_config_AST_SPOOL_DIR[PATH_MAX];
-extern char ast_config_AST_MONITOR_DIR[PATH_MAX];
-extern char ast_config_AST_VAR_DIR[PATH_MAX];
-extern char ast_config_AST_DATA_DIR[PATH_MAX];
-extern char ast_config_AST_LOG_DIR[PATH_MAX];
-extern char ast_config_AST_AGI_DIR[PATH_MAX];
-extern char ast_config_AST_DB[PATH_MAX];
-extern char ast_config_AST_KEY_DIR[PATH_MAX];
-extern char ast_config_AST_PID[PATH_MAX];
-extern char ast_config_AST_SOCKET[PATH_MAX];
-extern char ast_config_AST_RUN_DIR[PATH_MAX];
-extern char ast_config_AST_RUN_GROUP[PATH_MAX];
-extern char ast_config_AST_RUN_USER[PATH_MAX];
-extern char ast_config_AST_CTL_PERMISSIONS[PATH_MAX];
-extern char ast_config_AST_CTL_OWNER[PATH_MAX];
-extern char ast_config_AST_CTL_GROUP[PATH_MAX];
-extern char ast_config_AST_CTL[PATH_MAX];
-extern char ast_config_AST_SYSTEM_NAME[20];
-
 int ast_set_priority(int);			/*!< Provided by asterisk.c */
 int load_modules(unsigned int);			/*!< Provided by loader.c */
 int load_pbx(void);				/*!< Provided by pbx.c */
diff --git a/include/asterisk/paths.h b/include/asterisk/paths.h
index d90dd9544b..4c80c3199c 100644
--- a/include/asterisk/paths.h
+++ b/include/asterisk/paths.h
@@ -34,6 +34,8 @@ extern char ast_config_AST_KEY_DIR[PATH_MAX];
 extern char ast_config_AST_PID[PATH_MAX];
 extern char ast_config_AST_SOCKET[PATH_MAX];
 extern char ast_config_AST_RUN_DIR[PATH_MAX];
+extern char ast_config_AST_RUN_GROUP[PATH_MAX];
+extern char ast_config_AST_RUN_USER[PATH_MAX];
 extern char ast_config_AST_CTL_PERMISSIONS[PATH_MAX];
 extern char ast_config_AST_CTL_OWNER[PATH_MAX];
 extern char ast_config_AST_CTL_GROUP[PATH_MAX];