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

Fix compilation on MacOS X

Browse source 
Some functions declared in MacOS X headers use the always_inline
attribute, thus defining it to be a different expression breaks the
build.
This commit is contained in:
Andrea Canciani 2010-01-23 18:25:11 +01:00
parent 90ba1242b6
commit c8a61a3267
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cairo-botor-scan-converter.c
View file

@ -181,7 +181,7 @@ typedef struct _sweep_line {
jmp_buf unwind;
} sweep_line_t;
always_inline static struct quorem
cairo_always_inline static struct quorem
floored_divrem (int a, int b)
{
struct quorem qr;
@ -1496,7 +1496,7 @@ full_step (cairo_botor_scan_converter_t *self,
full_reset (sweep_line);
}
always_inline static void
cairo_always_inline static void
sub_inc_edge (edge_t *edge,
cairo_fixed_t height)
{
@ -1628,7 +1628,7 @@ sub_evenodd (sweep_line_t *sweep_line)
} while (pos != &sweep_line->active);
}
always_inline static void
cairo_always_inline static void
sub_step (cairo_botor_scan_converter_t *self,
sweep_line_t *sweep_line)
{
@ -1720,7 +1720,7 @@ coverage_render_vertical_runs (sweep_line_t *sweep, edge_t *edge, cairo_fixed_t
cell->uncovered_area += 2 * _cairo_fixed_fractional_part (edge->x.quo) * height;
}
always_inline static void
cairo_always_inline static void
sub_emit (cairo_botor_scan_converter_t *self,
sweep_line_t *sweep,
cairo_span_renderer_t *renderer)

4
src/cairo-compiler-private.h
View file

@ -143,11 +143,11 @@
#if __GNUC__ >= 3
#define cairo_pure __attribute__((pure))
#define cairo_const __attribute__((const))
#define always_inline inline __attribute__((always_inline))
#define cairo_always_inline inline __attribute__((always_inline))
#else
#define cairo_pure
#define cairo_const
#define always_inline inline
#define cairo_always_inline inline
#endif
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)

4
src/cairo-gl-private.h
View file

@ -158,7 +158,7 @@ _cairo_gl_operand_init (cairo_gl_composite_operand_t *operand,
int dst_x, int dst_y,
int width, int height);
static always_inline cairo_status_t cairo_warn
static cairo_always_inline cairo_status_t cairo_warn
_cairo_gl_context_acquire (cairo_device_t *device,
cairo_gl_context_t **ctx)
{
@ -172,7 +172,7 @@ _cairo_gl_context_acquire (cairo_device_t *device,
return CAIRO_STATUS_SUCCESS;
}
static always_inline void
static cairo_always_inline void
_cairo_gl_context_release (cairo_gl_context_t *ctx)
{
cairo_device_release (&ctx->base);