[asterisk-commits] trunk r12897 - in /trunk: asterisk.c include/asterisk/options.h

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 14 10:57:35 2006
New Revision: 12897

URL: http://svn.digium.com/view/asterisk?rev=12897&view=rev
Log:
clarify which global options are enabled by default

Modified:
    trunk/asterisk.c
    trunk/include/asterisk/options.h

Modified: trunk/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/asterisk.c?rev=12897&r1=12896&r2=12897&view=diff
==============================================================================
--- trunk/asterisk.c (original)
+++ trunk/asterisk.c Tue Mar 14 10:57:35 2006
@@ -152,7 +152,7 @@
  */
 /*! @{ */
 
-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 */

Modified: trunk/include/asterisk/options.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/options.h?rev=12897&r1=12896&r2=12897&view=diff
==============================================================================
--- trunk/include/asterisk/options.h (original)
+++ trunk/include/asterisk/options.h Tue Mar 14 10:57:35 2006
@@ -74,6 +74,9 @@
 	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)