diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-08-06 12:56:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-08-06 12:56:02 -0400 |
| commit | 5af6340eef9833f0f8e878939e88d98b11813578 (patch) | |
| tree | 8ff5a1b362c8f13b58b04bd1cb34e13f0d3edabc /pango/pangofc-font-private.h | |
| parent | 22dfeef4a26984ba81c6ff30117017dac372b706 (diff) | |
| download | pango-5af6340eef9833f0f8e878939e88d98b11813578.tar.gz | |
Reinstate the return type of pango_fc_font_lock_face()
We did not remove the freetype dependency from libpango
anyway, so bite the bullet, and keep including freetype
headers.
Changing the return type to gpointer broke C++ users,
where casts from void* are not automatic.
Diffstat (limited to 'pango/pangofc-font-private.h')
| -rw-r--r-- | pango/pangofc-font-private.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/pango/pangofc-font-private.h b/pango/pangofc-font-private.h index 0f538bb7..30a2e7fd 100644 --- a/pango/pangofc-font-private.h +++ b/pango/pangofc-font-private.h @@ -25,20 +25,6 @@ #include <pango/pangofc-font.h> #include <pango/pango-font-private.h> -/* Freetype has undefined macros in its header */ -#ifdef PANGO_COMPILATION -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wundef" -#endif - -#include <ft2build.h> -#include FT_FREETYPE_H -#include <fontconfig/fontconfig.h> - -#ifdef PANGO_COMPILATION -#pragma GCC diagnostic pop -#endif - G_BEGIN_DECLS @@ -108,7 +94,7 @@ struct _PangoFcFontClass PangoFontClass parent_class; /*< public >*/ - gpointer (*lock_face) (PangoFcFont *font); + FT_Face (*lock_face) (PangoFcFont *font); void (*unlock_face) (PangoFcFont *font); gboolean (*has_char) (PangoFcFont *font, gunichar wc); |