Index: src/cairo_ft_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_ft_font.c,v
retrieving revision 1.34
diff -u -r1.34 cairo_ft_font.c
--- src/cairo_ft_font.c	21 Jan 2005 23:31:16 -0000	1.34
+++ src/cairo_ft_font.c	22 Jan 2005 11:36:57 -0000
@@ -521,7 +521,8 @@
     if (!hinting)
 	load_flags |= FT_LOAD_NO_HINTING;
 #endif /* FC_FHINT_STYLE */
-    
+   
+#ifdef FC_HINT_STYLE
     switch (hintstyle) {
     case FC_HINT_SLIGHT:
     case FC_HINT_MEDIUM:
@@ -531,6 +532,7 @@
 	load_flags |= FT_LOAD_TARGET_NORMAL;
 	break;
     }
+#endif
     
     /* force autohinting if requested */
     if (FcPatternGetBool (pattern,
Index: src/cairo_gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_gstate.c,v
retrieving revision 1.74
diff -u -r1.74 cairo_gstate.c
--- src/cairo_gstate.c	21 Jan 2005 23:43:55 -0000	1.74
+++ src/cairo_gstate.c	22 Jan 2005 11:36:59 -0000
@@ -2218,7 +2218,7 @@
 _cairo_gstate_current_font (cairo_gstate_t *gstate,
  			    cairo_font_t  **font)
 {
-    status = _cairo_gstate_ensure_font (gstate);
+    cairo_status_t status = _cairo_gstate_ensure_font (gstate);
     if (status)
 	return status;