diff --git a/clutter/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c index 9c11604f0..4d82671e8 100644 --- a/clutter/clutter/clutter-settings.c +++ b/clutter/clutter/clutter-settings.c @@ -21,7 +21,6 @@ #ifdef HAVE_PANGO_FT2 /* for pango_fc_font_map_cache_clear() */ -#define PANGO_ENABLE_BACKEND #include #endif /* HAVE_PANGO_FT2 */ diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c index 82109f1cc..ebfea6c29 100644 --- a/cogl/cogl-pango/cogl-pango-fontmap.c +++ b/cogl/cogl-pango/cogl-pango-fontmap.c @@ -28,12 +28,6 @@ #include "config.h" -/* This is needed to get the Pango headers to export stuff needed to - subclass */ -#ifndef PANGO_ENABLE_BACKEND -#define PANGO_ENABLE_BACKEND 1 -#endif - #include #include #include diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c index 7abefbc6a..cbd9d0a63 100644 --- a/cogl/cogl-pango/cogl-pango-render.c +++ b/cogl/cogl-pango/cogl-pango-render.c @@ -35,17 +35,6 @@ #include "config.h" -#ifndef PANGO_ENABLE_BACKEND -#define PANGO_ENABLE_BACKEND 1 -#endif - -#ifndef PANGO_UNKNOWN_GLYPH_WIDTH -#define PANGO_UNKNOWN_GLYPH_WIDTH 10 -#endif -#ifndef PANGO_UNKNOWN_GLYPH_HEIGHT -#define PANGO_UNKNOWN_GLYPH_HEIGHT 14 -#endif - #include #include #include @@ -59,6 +48,9 @@ #include "cogl-pango/cogl-pango-glyph-cache.h" #include "cogl-pango/cogl-pango-display-list.h" +#define PANGO_UNKNOWN_GLYPH_WIDTH 10 +#define PANGO_UNKNOWN_GLYPH_HEIGHT 14 + enum { PROP_0,