pango r2591 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Wed Apr  9 18:13:00 2008
New Revision: 2591
URL: http://svn.gnome.org/viewvc/pango?rev=2591&view=rev

Log:
2008-04-09  Behdad Esfahbod  <behdad gnome org>

        * pango/pangocairo-atsui.h:
        * pango/pangocairo-atsuifont.c:
        Really fix build without cairo-atsui.



Modified:
   trunk/ChangeLog
   trunk/pango/pangocairo-atsui.h
   trunk/pango/pangocairo-atsuifont.c

Modified: trunk/pango/pangocairo-atsui.h
==============================================================================
--- trunk/pango/pangocairo-atsui.h	(original)
+++ trunk/pango/pangocairo-atsui.h	Wed Apr  9 18:13:00 2008
@@ -25,7 +25,7 @@
 #include "pangoatsui-private.h"
 #include <pango/pangocairo.h>
 #ifdef CAIRO_HAS_QUARTZ_FONT
-#include <cairo-quartz-font.h>
+#include <cairo-quartz.h>
 #else
 #include <cairo-atsui.h>
 #endif

Modified: trunk/pango/pangocairo-atsuifont.c
==============================================================================
--- trunk/pango/pangocairo-atsuifont.c	(original)
+++ trunk/pango/pangocairo-atsuifont.c	Wed Apr  9 18:13:00 2008
@@ -79,6 +79,7 @@
 }
 
 /* XXX remove when we require cairo 1.6 */
+#undef cairo_atsui_font_face_create_for_atsu_font_id
 cairo_public cairo_font_face_t *
 cairo_atsui_face_create_for_atsu_font_id (ATSUFontID font_id);