brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not include cogl-pango.h multiple times

Browse Source 
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.
This commit is contained in:
Emmanuele Bassi 2008-12-22 13:24:52 +00:00
parent 6b782ce4e7
commit 4a934c363c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-private.h
View File

@ -38,6 +38,8 @@
#include <glib.h>
#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

4
clutter/clutter-text.c
View File

@ -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 */