From 16b09ac48cdcb5db25b0a1bde0e53a1eae619519 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 27 Dec 2006 21:09:35 +0000 Subject: [PATCH] Merged revisions 48998 via svnmerge from 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 --- include/asterisk/options.h | 2 ++ main/asterisk.c | 2 -- main/file.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 3f7569ca1f..5b6ffe0ebf 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -122,6 +122,8 @@ extern pid_t ast_mainpid; extern char record_cache_dir[AST_CACHE_DIR_LEN]; extern char debug_filename[AST_FILENAME_MAX]; +extern int ast_language_is_prefix; + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/main/asterisk.c b/main/asterisk.c index 056f21c8d0..86da7b17e6 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -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 }; int option_verbose = 0; /*!< Verbosity level */ diff --git a/main/file.c b/main/file.c index f67fbec29d..5311b3a43d 100644 --- a/main/file.c +++ b/main/file.c @@ -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). * 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);