AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

win32: Rename a shadowing variable

Browse Source
This commit is contained in:
Benjamin Otte 2019-05-21 07:15:16 +02:00
parent 9521af0f6a
commit 4f0cc3086f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkmain.c
View File

@ -419,7 +419,6 @@ enum_locale_proc (LPTSTR locale)
SUBLANGID (LANGIDFROMLCID (lcid)) == SUBLANG_DEFAULT)))
{
char language[100], country[100];
char locale[300];
if (script_to_check != NULL)
{
@ -467,11 +466,13 @@ enum_locale_proc (LPTSTR locale)
if (GetLocaleInfo (lcid, LOCALE_SENGLANGUAGE, language, sizeof (language)) &&
GetLocaleInfo (lcid, LOCALE_SENGCOUNTRY, country, sizeof (country)))
{
strcpy (locale, language);
strcat (locale, "_");
strcat (locale, country);
char str[300];
if (setlocale (LC_ALL, locale) != NULL)
strcpy (str, language);
strcat (str, "_");
strcat (str, country);
if (setlocale (LC_ALL, str) != NULL)
setlocale_called = TRUE;
}