kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 21:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 48998 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48998 | kpfleming | 2006-12-27 15:08:30 -0600 (Wed, 27 Dec 2006) | 3 lines

move extern declaration for this option to a header file where it belongs
provide an initial value for 'languageprefix' option, instead of relying on randomness to provide a useful value

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-12-27 21:09:35 +00:00
parent 906a51a1af
commit 16b09ac48c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/options.h
View File

@@ -122,6 +122,8 @@ extern pid_t ast_mainpid;
extern char record_cache_dir[AST_CACHE_DIR_LEN]; extern char record_cache_dir[AST_CACHE_DIR_LEN];
extern char debug_filename[AST_FILENAME_MAX]; extern char debug_filename[AST_FILENAME_MAX];
extern int ast_language_is_prefix;
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} }
#endif #endif

2
main/asterisk.c
View File

@@ -151,8 +151,6 @@ int daemon(int, int); /* defined in libresolv of all places */
*/ */
/*! @{ */ /*! @{ */
extern int ast_language_is_prefix; /* XXX move to some header */
struct ast_flags ast_options = { AST_DEFAULT_OPTIONS }; struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
int option_verbose = 0; /*!< Verbosity level */ int option_verbose = 0; /*!< Verbosity level */

2
main/file.c
View File

@@ -61,7 +61,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* (i.e. en/digits/1.gsm, it/digits/1.gsm or default to digits/1.gsm). * (i.e. en/digits/1.gsm, it/digits/1.gsm or default to digits/1.gsm).
* The latter permits a language to be entirely in one directory. * The latter permits a language to be entirely in one directory.
*/ */
int ast_language_is_prefix; int ast_language_is_prefix = 0;
static AST_LIST_HEAD_STATIC(formats, ast_format); static AST_LIST_HEAD_STATIC(formats, ast_format);