summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cairo-botor-scan-converter.c8
-rw-r--r--src/cairo-compiler-private.h4
-rw-r--r--src/cairo-gl-private.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/cairo-botor-scan-converter.c b/src/cairo-botor-scan-converter.c
index e6113fb4..10326e7f 100644
--- a/src/cairo-botor-scan-converter.c
+++ b/src/cairo-botor-scan-converter.c
@@ -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)
diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
index 34da73cd..c3814d2b 100644
--- a/src/cairo-compiler-private.h
+++ b/src/cairo-compiler-private.h
@@ -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__)
diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h
index d08e5453..84f01438 100644
--- a/src/cairo-gl-private.h
+++ b/src/cairo-gl-private.h
@@ -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);