Merge branch 'matthiasc/for-master' into 'master'

misc fixes

See merge request GNOME/pango!242

3 files changed, 7 insertions, 5 deletions

diff --git a/pango/pango-language.c b/pango/pango-language.c
index bb5ed470..410ca0bf 100644
--- a/pango/pango-language.c
+++ b/pango/pango-language.c
@@ -66,7 +66,7 @@ pango_language_get_private (PangoLanguage *language)
   if (!language)
     return NULL;
 
-  priv = (PangoLanguagePrivate *) ((char *)language - sizeof (PangoLanguagePrivate));
+  priv = (PangoLanguagePrivate *)(void *)((char *)language - sizeof (PangoLanguagePrivate));
 
   if (G_UNLIKELY (priv->magic != PANGO_LANGUAGE_PRIVATE_MAGIC))
     {
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 4b6a34f7..7456cd9e 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -993,7 +993,7 @@ pango_fc_font_create_hb_font (PangoFont *font)
 
   if (key)
     {
-      FcPattern *pattern = pango_fc_font_key_get_pattern (key);
+      const FcPattern *pattern = pango_fc_font_key_get_pattern (key);
       const char *variations;
       int index;
       unsigned int n_axes;
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 5362d6fc..a5b6d279 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -362,13 +362,13 @@ main (int argc, char *argv[])
   const gchar *name;
   gchar *path;
 
-  g_test_init (&argc, &argv, NULL);
-
   /* allow to easily generate expected output for new test cases */
-  if (argc > 1)
+  if (argc > 1 && argv[1][0] != '-')
     {
       GString *string;
 
+      setlocale (LC_ALL, "en_US.utf8");
+
       string = g_string_sized_new (0);
       test_file (argv[1], string);
       g_test_message ("%s", string->str);
@@ -376,6 +376,8 @@ main (int argc, char *argv[])
       return 0;
     }
 
+  g_test_init (&argc, &argv, NULL);
+
   path = g_test_build_filename (G_TEST_DIST, "layouts", NULL);
   dir = g_dir_open (path, 0, &error);
   g_free (path);