fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-25 16:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enabled __internal_linkage for all internal functions. Now avoid the warning by moving the * from the return type after the __internal_linkage macro. It looks awaful, but it keeps the compiler quiet.

Browse source
This commit is contained in:
Carl Worth 2004-12-20 09:53:06 +00:00
parent 5c1c5e67dc
commit eecfec86f1
3 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BUGS
View file

@ -1,15 +1,3 @@
As of gcc 3.4, all uses of the __internal_linkage macro on
functions returning pointers to structured types are causing a
warning of the form:
cairoint.h:406: warning: `__visibility__' attribute ignored on non-class types
I'm commenting these out to shut up the compiler, and tagging each
case with "XXX-NON-CLASS:". We should determine if these uses should be
removed completely or if they can be fixed in some way.
--
The caches need to be invalidated at font destruction time.
--

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-12-20 Carl Worth <cworth@cworth.org>
* src/cairoint.h: Re-enabled __internal_linkage for all internal
functions. Now avoid the warning by moving the * from the return
type after the __internal_linkage macro. It looks awaful, but it
keeps the compiler quiet.
2004-12-20 Alexander Larsson <alexl@redhat.com>
* src/cairoint.h:

34
src/cairoint.h
View file

@ -402,17 +402,7 @@ _cairo_lock_global_image_glyph_cache (void);
extern void __internal_linkage
_cairo_unlock_global_image_glyph_cache (void);
/* XXX: As of gcc 3.4, all uses of the __internal_linkage macro on
functions returning pointers to structured types are causing a
warning of the form:
cairoint.h:406: warning: `__visibility__' attribute ignored on non-class types
I'm commenting these out to shut up the compiler, and tagging each
case with "XXX-NON-CLASS:". We should determine if these uses should be
removed completely or if they can be fixed in some way.
*/
extern cairo_cache_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_cache_t __internal_linkage *
_cairo_get_global_image_glyph_cache (void);
/* Some glyph cache functions you can reuse. */
@ -823,7 +813,7 @@ _cairo_fixed_integer_ceil (cairo_fixed_t f);
/* cairo_gstate.c */
extern cairo_gstate_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_gstate_t __internal_linkage *
_cairo_gstate_create (void);
extern void __internal_linkage
@ -838,7 +828,7 @@ _cairo_gstate_fini (cairo_gstate_t *gstate);
extern void __internal_linkage
_cairo_gstate_destroy (cairo_gstate_t *gstate);
extern cairo_gstate_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_gstate_t __internal_linkage *
_cairo_gstate_clone (cairo_gstate_t *gstate);
extern cairo_status_t __internal_linkage
@ -853,13 +843,13 @@ _cairo_gstate_end_group (cairo_gstate_t *gstate);
extern cairo_status_t __internal_linkage
_cairo_gstate_set_target_surface (cairo_gstate_t *gstate, cairo_surface_t *surface);
extern cairo_surface_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_surface_t __internal_linkage *
_cairo_gstate_current_target_surface (cairo_gstate_t *gstate);
extern cairo_status_t __internal_linkage
_cairo_gstate_set_pattern (cairo_gstate_t *gstate, cairo_pattern_t *pattern);
extern cairo_pattern_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_pattern_t __internal_linkage *
_cairo_gstate_current_pattern (cairo_gstate_t *gstate);
extern cairo_status_t __internal_linkage
@ -1142,7 +1132,7 @@ _cairo_color_set_alpha (cairo_color_t *color, double alpha);
/* cairo_font.c */
extern cairo_unscaled_font_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_unscaled_font_t __internal_linkage *
_cairo_unscaled_font_create (const char *family,
cairo_font_slant_t slant,
cairo_font_weight_t weight);
@ -1284,14 +1274,14 @@ extern cairo_status_t __internal_linkage
_cairo_path_stroke_to_traps (cairo_path_t *path, cairo_gstate_t *gstate, cairo_traps_t *traps);
/* cairo_surface.c */
extern cairo_surface_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_surface_t __internal_linkage *
_cairo_surface_create_similar_scratch (cairo_surface_t *other,
cairo_format_t format,
int drawable,
int width,
int height);
extern cairo_surface_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_surface_t __internal_linkage *
_cairo_surface_create_similar_solid (cairo_surface_t *other,
cairo_format_t format,
int width,
@ -1350,7 +1340,7 @@ _cairo_surface_show_page (cairo_surface_t *surface);
extern double __internal_linkage
_cairo_surface_pixels_per_inch (cairo_surface_t *surface);
extern cairo_image_surface_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_image_surface_t __internal_linkage *
_cairo_surface_get_image (cairo_surface_t *surface);
extern cairo_status_t __internal_linkage
@ -1367,7 +1357,7 @@ _cairo_surface_create_pattern (cairo_surface_t *surface,
/* cairo_image_surface.c */
extern cairo_image_surface_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_image_surface_t __internal_linkage *
_cairo_image_surface_create_with_masks (char *data,
cairo_format_masks_t *format,
int width,
@ -1552,7 +1542,7 @@ extern void __internal_linkage
_cairo_pattern_init_solid (cairo_pattern_t *pattern,
double red, double green, double blue);
extern cairo_pattern_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_pattern_t __internal_linkage *
_cairo_pattern_create_solid (double red, double green, double blue);
extern cairo_status_t __internal_linkage
@ -1582,7 +1572,7 @@ _cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op,
cairo_fixed_t factor,
int *pixel);
extern cairo_image_surface_t * /* XXX-NON-CLASS: __internal_linkage */
extern cairo_image_surface_t __internal_linkage *
_cairo_pattern_get_image (cairo_pattern_t *pattern, cairo_box_t *box);
/* Avoid unnecessary PLT entries. */