diff options
| author | Benjamin Otte <otte@redhat.com> | 2019-05-21 07:15:16 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2019-05-21 07:23:30 +0200 |
| commit | 4f0cc3086f929755d8bf3b1291f757fb634f17ae (patch) | |
| tree | 1f3773e49031dcbab1559a46f811af3a53f96ea2 | |
| parent | 9521af0f6ab376c4b1ca16394872dfbc6a5676b3 (diff) | |
| download | gtk+-4f0cc3086f929755d8bf3b1291f757fb634f17ae.tar.gz | |
win32: Rename a shadowing variable
| -rw-r--r-- | gtk/gtkmain.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 22513d95c3..4dce1cd7e7 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -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; } |