summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-06-10 23:14:42 +0000
committerMatthias Clasen <mclasen@redhat.com>2018-06-10 23:14:42 +0000
commit4f632296a57ee3df809c2a405ac5fb93550aa98e (patch)
treed703da62e1b48a39c8dd36ef58c01f1296ad0e8c /gtk/gtkmain.c
parentc047e97cfa7914e0b3ba032a1eb2ac08d9bc7fd8 (diff)
parent43f37894b02e74d87c0474d20ea74e7997d0b872 (diff)
downloadgtk+-4f632296a57ee3df809c2a405ac5fb93550aa98e.tar.gz
Merge branch 'lrn/gtk4warnings' into 'master'
Fix a lot of warnings in GTK4 See merge request GNOME/gtk!188
Diffstat (limited to 'gtk/gtkmain.c')
-rw-r--r--gtk/gtkmain.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index fd26bdef73..0f3639d139 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -432,6 +432,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)
@@ -447,6 +449,8 @@ enum_locale_proc (LPTSTR locale)
case MAKELANGID (LANG_SERBIAN, 0x06):
/* Serbian in Bosnia and Herzegovina, Latin */
return TRUE;
+ default:
+ break;
}
}
}
@@ -522,7 +526,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
{
@@ -531,7 +535,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);