From: Руслан Ижбулатов Date: Sun, 10 Jun 2018 21:02:56 +0000 (+0000) Subject: Fix some warnings in W32 part of gtkmain X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~182^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=411c535956254353ac5df7b40d05d2ffe006ab09;p=gtk4.git Fix some warnings in W32 part of gtkmain * Add missing default cases * Cast string literals as non-const --- diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 85bcc3865c..ee9ee075a1 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -431,6 +431,8 @@ enum_locale_proc (LPTSTR locale) case MAKELANGID (LANG_SERBIAN, 0x07): /* Serbian in Bosnia and Herzegovina, Cyrillic */ return TRUE; + default: + break; } } else if (strcmp (script_to_check, "Cyrl") == 0) @@ -446,6 +448,8 @@ enum_locale_proc (LPTSTR locale) case MAKELANGID (LANG_SERBIAN, 0x06): /* Serbian in Bosnia and Herzegovina, Latin */ return TRUE; + default: + break; } } } @@ -521,7 +525,7 @@ setlocale_initialization (void) */ if (strcmp (iso3166_to_check, "CS") == 0 || strcmp (iso3166_to_check, "YU") == 0) - iso3166_to_check = "SP"; + iso3166_to_check = (char *) "SP"; } else { @@ -530,7 +534,7 @@ setlocale_initialization (void) *script_to_check++ = '\0'; /* LANG_SERBIAN == LANG_CROATIAN, recognize just "sr" */ if (strcmp (iso639_to_check, "sr") == 0) - iso3166_to_check = "SP"; + iso3166_to_check = (char *) "SP"; } EnumSystemLocales (enum_locale_proc, LCID_SUPPORTED);