From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 14 Mar 2006 16:57:35 +0000 (+0000)
Subject: clarify which global options are enabled by default
X-Git-Tag: 1.4.0-beta1~2426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4279bf18f8473448cfda40d35987518d100ce6d4;p=thirdparty%2Fasterisk.git

clarify which global options are enabled by default


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

diff --git a/asterisk.c b/asterisk.c
index 0b4b12a3dd..d5394ca0c5 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -152,7 +152,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  */
 /*! @{ */
 
-struct ast_flags ast_options = { AST_OPT_FLAG_TRANSCODE_VIA_SLIN };
+struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
 
 int option_verbose = 0;				/*!< Verbosity level */
 int option_debug = 0;				/*!< Debug level */
diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 73d98b2755..03470d2174 100644
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -74,6 +74,9 @@ enum ast_option_flags {
 	AST_OPT_END_CDR_BEFORE_H_EXTEN = (1 << 19)
 };
 
+/*! These are the options that set by default when Asterisk starts */
+#define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN
+
 #define ast_opt_exec_includes		ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES)
 #define ast_opt_no_fork			ast_test_flag(&ast_options, AST_OPT_FLAG_NO_FORK)
 #define ast_opt_quiet			ast_test_flag(&ast_options, AST_OPT_FLAG_QUIET)