[cairo] Conflicting type errors compiling with gcc-3.4

[Jeff Franks]

I found the following conflicting type errors while trying to compile
cairo with gcc-3.4.

The following functions declarations in cairoint.h return type
cairo_int_status_t but the corresponding defintions in cairo_font.c
return type cairo_status_t. Are the function declarations supposed to
return type cairo_status_t?

_cairo_font_init
_cairo_font_text_extents
_cairo_font_glyph_extents
_cairo_font_show_text
_cairo_font_show_glyphs
_cairo_font_text_path
_cairo_font_glyph_path
_cairo_font_font_extents

The following function declaration in cairoint.h returns type
cairo_fill_rule_t but the definition in cairo_gstate.c returns type
cairo_status_t. Is the function definiton suppose to return type
cairo_fill_rule_t?

_cairo_gstate_current_fill_rule

The following function declaration in cairoint.h returns type
cairo_status_t but the definition in cairo_surface.c returns type
cairo_int_status_t. Is the function declaration supposed to return type
cairo_int_status_t?

_cairo_surface_composite

I made the questioned changes as a test and was able to get cairo to
compile ok with gcc-3.4.

Regards,
Jeff Franks