[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35068] trunk/blender/source/blender/ blenfont/intern/blf_lang.c: Too many ifdefs made me miss the fact variables were declared inside
Ton Roosendaal
ton at blender.org
Tue Feb 22 13:17:45 CET 2011
Revision: 35068
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35068
Author: ton
Date: 2011-02-22 12:17:45 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Too many ifdefs made me miss the fact variables were declared inside
function...
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_lang.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-02-22 12:01:57 UTC (rev 35067)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-02-22 12:17:45 UTC (rev 35068)
@@ -77,30 +77,34 @@
/* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */
void BLF_lang_set(const char *str)
{
- if(str==NULL)
+ if(str==NULL) {
return;
+ }
+ else {
#if defined (_WIN32) || defined(__APPLE__)
- BLI_setenv("LANG", str);
+ BLI_setenv("LANG", str);
#else
- char *locreturn= setlocale(LC_ALL, str);
- if (locreturn == NULL) {
- char *lang= BLI_sprintfN("%s.UTF-8", str);
+ char *locreturn= setlocale(LC_ALL, str);
+ if (locreturn == NULL) {
+ char *lang= BLI_sprintfN("%s.UTF-8", str);
- locreturn= setlocale(LC_ALL, lang);
- if (locreturn == NULL) {
- printf("could not change language to %s nor %s\n", str, lang);
+ locreturn= setlocale(LC_ALL, lang);
+ if (locreturn == NULL) {
+ printf("could not change language to %s nor %s\n", str, lang);
+ }
+
+ MEM_freeN(lang);
}
- MEM_freeN(lang);
+ setlocale(LC_NUMERIC, "C");
+#endif
+ textdomain(DOMAIN_NAME);
+ bindtextdomain(DOMAIN_NAME, global_messagepath);
+ /* bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); */
+ BLI_strncpy(global_language, str, sizeof(global_language));
+
}
-
- setlocale(LC_NUMERIC, "C");
-#endif
- textdomain(DOMAIN_NAME);
- bindtextdomain(DOMAIN_NAME, global_messagepath);
- /* bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); */
- BLI_strncpy(global_language, str, sizeof(global_language));
}
void BLF_lang_encoding(const char *str)
More information about the Bf-blender-cvs
mailing list