[cairo] gcc3.4

[Florian Scandella]

heres a small diff to compile cairo-0.1.22 with gcc 3.4 .. i don't know
if its correct (its about different types in declaration and
implementation, i dont know whats right), but it compiles. ..


flo

--- cairo-0.1.22/src/cairo_font.c       2003-12-16 15:50:37.000000000
+0100
+++ cairo-0.1.22/src/cairo_font.c       2004-05-05 15:42:11.072321168
+0200
@@ -43,7 +43,7 @@
     return backend->create (family, slant, weight);
 }
  
-cairo_status_t
+cairo_int_status_t
 _cairo_font_init (cairo_font_t *font,
                  const struct cairo_font_backend *backend)
 {
@@ -88,7 +88,7 @@
 }
  
  
-cairo_status_t
+cairo_int_status_t
 _cairo_font_text_extents (cairo_font_t *font,
                          const unsigned char *utf8,
                          cairo_text_extents_t *extents)
@@ -96,7 +96,7 @@
     return font->backend->text_extents(font, utf8, extents);
 }
  
-cairo_status_t
+cairo_int_status_t
 _cairo_font_glyph_extents (cairo_font_t *font,
                            cairo_glyph_t *glyphs,
                            int num_glyphs,
@@ -106,7 +106,7 @@
 }
  
                                                                                                                           
-cairo_status_t
+cairo_int_status_t
 _cairo_font_show_text (cairo_font_t            *font,
                       cairo_operator_t         operator,
                       cairo_surface_t          *source,
@@ -119,7 +119,7 @@
                                    surface, x, y, utf8);
 }
                                                                                                                           
-cairo_status_t
+cairo_int_status_t
 _cairo_font_show_glyphs (cairo_font_t           *font,
                          cairo_operator_t       operator,
                          cairo_surface_t        *source,
@@ -131,7 +131,7 @@
                                      surface, glyphs, num_glyphs);
 }
                                                                                                                           
-cairo_status_t
+cairo_int_status_t
 _cairo_font_text_path (cairo_font_t             *font,
                       double                   x,
                       double                   y,
@@ -141,7 +141,7 @@
     return font->backend->text_path(font, x, y, utf8, path);
 }
                                                                                                                           
-cairo_status_t
+cairo_int_status_t
 _cairo_font_glyph_path (cairo_font_t            *font,
                         cairo_glyph_t           *glyphs,
                         int                     num_glyphs,
@@ -150,7 +150,7 @@
     return font->backend->glyph_path(font, glyphs, num_glyphs, path);
 }
                                                                                                                           
-cairo_status_t
+cairo_int_status_t
 _cairo_font_font_extents (cairo_font_t *font,
                          cairo_font_extents_t *extents)
 {
--- cairo-0.1.22/src/cairo_gstate.c     2004-04-07 03:05:18.000000000
+0200
+++ cairo-0.1.22/src/cairo_gstate.c     2004-05-05 15:42:11.068321776
+0200
@@ -452,7 +452,7 @@
     return CAIRO_STATUS_SUCCESS;
 }
                                                                                                                           
-cairo_status_t
+cairo_fill_rule_t
 _cairo_gstate_current_fill_rule (cairo_gstate_t *gstate)
 {
     return gstate->fill_rule;
--- cairo-0.1.22/src/cairo_surface.c    2004-04-14 03:14:29.000000000
+0200
+++ cairo-0.1.22/src/cairo_surface.c    2004-05-05 15:42:11.065322232
+0200
@@ -203,7 +203,7 @@
 }
 slim_hidden_def(cairo_surface_set_repeat);
                                                                                                                           
-cairo_int_status_t
+cairo_status_t
 _cairo_surface_composite (cairo_operator_t     operator,
                          cairo_surface_t       *src,
                          cairo_surface_t       *mask,