[asterisk-commits] kpfleming: trunk r48999 - in /trunk: ./ include/asterisk/ main/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Dec 27 15:09:35 2006
New Revision: 48999

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48999
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/options.h
    trunk/main/asterisk.c
    trunk/main/file.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/include/asterisk/options.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/options.h?view=diff&rev=48999&r1=48998&r2=48999
==============================================================================
--- trunk/include/asterisk/options.h (original)
+++ trunk/include/asterisk/options.h Wed Dec 27 15:09:35 2006
@@ -122,6 +122,8 @@
 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

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=48999&r1=48998&r2=48999
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Dec 27 15:09:35 2006
@@ -150,8 +150,6 @@
   Some of them can be changed in the CLI 
  */
 /*! @{ */
-
-extern int ast_language_is_prefix;	/* XXX move to some header */
 
 struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
 

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=48999&r1=48998&r2=48999
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Wed Dec 27 15:09:35 2006
@@ -61,7 +61,7 @@
  * (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);