diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-17 23:25:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-17 23:25:00 +0000 |
| commit | 8095dd3217dfbcec4b009a87d534732730ae45bb (patch) | |
| tree | 9766c3a49a9cb94ff08728ebd57ec67e87efb1fc /pango | |
| parent | 25fedea4091818e39676e130f512214bf4192a8d (diff) | |
| parent | 553841ac75aa69f562391b98b983ec4881a89855 (diff) | |
| download | pango-8095dd3217dfbcec4b009a87d534732730ae45bb.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
misc fixes
See merge request GNOME/pango!242
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-language.c | 2 | ||||
| -rw-r--r-- | pango/pangofc-font.c | 2 |
2 files changed, 2 insertions, 2 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; |