From 4a934c363c559896c2dede5374cc33b63a7c01a7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 22 Dec 2008 13:24:52 +0000 Subject: [PATCH] Do not include cogl-pango.h multiple times The clutter-private.h header already includes cogl-pango.h with the correct inclusion path, because the main context stores a pointer to the font map. There is no need for clutter-text.c to include cogl-pango.h again since it already includes clutter-private.h. --- clutter/clutter-private.h | 3 ++- clutter/clutter-text.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h index 81e030adf..fb8aea93b 100644 --- a/clutter/clutter-private.h +++ b/clutter/clutter-private.h @@ -38,6 +38,8 @@ #include +#include "pango/cogl-pango.h" + #include "clutter-backend.h" #include "clutter-event.h" #include "clutter-feature.h" @@ -45,7 +47,6 @@ #include "clutter-stage-manager.h" #include "clutter-stage-window.h" #include "clutter-stage.h" -#include "pango/cogl-pango.h" G_BEGIN_DECLS diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c index e9eb6e174..ab2e323d7 100644 --- a/clutter/clutter-text.c +++ b/clutter/clutter-text.c @@ -54,11 +54,9 @@ #include "clutter-enum-types.h" #include "clutter-keysyms.h" #include "clutter-main.h" -#include "clutter-private.h" +#include "clutter-private.h" /* includes pango/cogl-pango.h */ #include "clutter-units.h" -#include "cogl-pango.h" - #define DEFAULT_FONT_NAME "Sans 10" /* cursor width in pixels */