Fixed several function prototype mismatches between internal header file and implementation (thanks to Carlos Romero and gcc-3.4).

This commit is contained in:
Carl Worth 2004-04-23 10:08:53 +00:00
parent e172b7cec7
commit c82011dddd
6 changed files with 20 additions and 12 deletions

View file

@ -1,3 +1,11 @@
2004-04-23 Carl Worth <cworth@isi.edu>
* src/cairoint.h:
* src/cairo_surface.c (_cairo_surface_composite):
* src/cairo_gstate.c (_cairo_gstate_current_fill_rule): Fixed
several function prototype mismatches between internal header file
and implementation (thanks to Carlos Romero and gcc-3.4).
2004-04-22 David Reveman <c99drn@cs.umu.se>
* src/cairoint.h:

View file

@ -452,7 +452,7 @@ _cairo_gstate_set_fill_rule (cairo_gstate_t *gstate, cairo_fill_rule_t fill_rule
return CAIRO_STATUS_SUCCESS;
}
cairo_status_t
cairo_fill_rule_t
_cairo_gstate_current_fill_rule (cairo_gstate_t *gstate)
{
return gstate->fill_rule;

View file

@ -203,7 +203,7 @@ cairo_surface_set_repeat (cairo_surface_t *surface, int repeat)
}
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,

View file

@ -452,7 +452,7 @@ _cairo_gstate_set_fill_rule (cairo_gstate_t *gstate, cairo_fill_rule_t fill_rule
return CAIRO_STATUS_SUCCESS;
}
cairo_status_t
cairo_fill_rule_t
_cairo_gstate_current_fill_rule (cairo_gstate_t *gstate)
{
return gstate->fill_rule;

View file

@ -203,7 +203,7 @@ cairo_surface_set_repeat (cairo_surface_t *surface, int repeat)
}
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,

View file

@ -928,7 +928,7 @@ _cairo_font_create (const char *family,
cairo_font_slant_t slant,
cairo_font_weight_t weight);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_init (cairo_font_t *font,
const struct cairo_font_backend *backend);
@ -941,22 +941,22 @@ _cairo_font_scale (cairo_font_t *font, double scale);
extern cairo_status_t __internal_linkage
_cairo_font_transform (cairo_font_t *font, cairo_matrix_t *matrix);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_font_extents (cairo_font_t *font,
cairo_font_extents_t *extents);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_text_extents (cairo_font_t *font,
const unsigned char *utf8,
cairo_text_extents_t *extents);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_glyph_extents (cairo_font_t *font,
cairo_glyph_t *glyphs,
int num_glyphs,
cairo_text_extents_t *extents);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_show_text (cairo_font_t *font,
cairo_operator_t operator,
cairo_surface_t *source,
@ -966,7 +966,7 @@ _cairo_font_show_text (cairo_font_t *font,
const unsigned char *utf8);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_show_glyphs (cairo_font_t *font,
cairo_operator_t operator,
cairo_surface_t *source,
@ -975,14 +975,14 @@ _cairo_font_show_glyphs (cairo_font_t *font,
int num_glyphs);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_text_path (cairo_font_t *font,
double x,
double y,
const unsigned char *utf8,
cairo_path_t *path);
extern cairo_int_status_t __internal_linkage
extern cairo_status_t __internal_linkage
_cairo_font_glyph_path (cairo_font_t *font,
cairo_glyph_t *glyphs,
int num_glyphs,