summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-06-11 18:48:34 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-06-11 18:48:34 +0000
commit38d0a3dd33ba64d3bbfa1234607474663a4a8291 (patch)
tree76f6d14ae432f36e8d43798ac710e6622b0ecee2
parent9ff014800b72b9f23955e43eb37df9b27381202f (diff)
downloadpango-38d0a3dd33ba64d3bbfa1234607474663a4a8291.tar.gz
Make sure all enabled font backends included (reported by Vincent
2007-06-11 Behdad Esfahbod <behdad@gnome.org> * pango/pangocairo-fontmap.c: Make sure all enabled font backends included (reported by Vincent Isambart). svn path=/trunk/; revision=2339
-rw-r--r--ChangeLog5
-rw-r--r--pango/pangocairo-fontmap.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d9b4ad1f..c2c7dc10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-06-11 Behdad Esfahbod <behdad@gnome.org>
+ * pango/pangocairo-fontmap.c: Make sure all enabled font backends
+ included (reported by Vincent Isambart).
+
+2007-06-11 Behdad Esfahbod <behdad@gnome.org>
+
* docs/pango_markup.sgml: Add 'gravity', 'gravity_hint', and
'letter_spacing' span attributes.
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index 31e36621..ad381160 100644
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -27,9 +27,11 @@
#if defined (HAVE_CAIRO_ATSUI)
# include "pangocairo-atsui.h"
-#elif defined (HAVE_CAIRO_WIN32)
+#endif
+#if defined (HAVE_CAIRO_WIN32)
# include "pangocairo-win32.h"
-#elif defined (HAVE_CAIRO_FREETYPE)
+#endif
+#if defined (HAVE_CAIRO_FREETYPE)
# include "pangocairo-fc.h"
#endif