diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-27 21:09:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-27 21:09:35 +0000 |
| commit | f16e0a15b8d2b1fdea85fcc3b0528992baf545e7 (patch) | |
| tree | 87d9c5c0cdb7b0708e1785c6035f0029bece9980 | |
| parent | 12f364fe0db0ab476d19af86e61f962824af7ed9 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@48999 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/options.h | 2 | ||||
| -rw-r--r-- | main/asterisk.c | 2 | ||||
| -rw-r--r-- | main/file.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 3f7569ca1..5b6ffe0eb 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 056f21c8d..86da7b17e 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 f67fbec29..5311b3a43 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); |