summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>2015-02-26 14:18:30 +0100
committerBryce Harrington <b.harrington@samsung.com>2015-03-05 12:00:48 -0800
commitac75ab9f30ef10ee5973d42223f4b51acca93333 (patch)
treeb776466f62e0d2dc085a8f340ad28c3b10fd7cdf
parent70cc8f250b5669e757b4f044571ba0f71e3dea9e (diff)
fix conflicting types for 'sync' on AIX, bug#89338
-rw-r--r--src/cairo-surface-observer.c12
-rw-r--r--src/cairo-xlib-surface-shm.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/cairo-surface-observer.c b/src/cairo-surface-observer.c
index 6721bf57d..52b013644 100644
--- a/src/cairo-surface-observer.c
+++ b/src/cairo-surface-observer.c
@@ -653,7 +653,7 @@ add_record (cairo_observation_t *log,
}
static void
-sync (cairo_surface_t *target, int x, int y)
+_cairo_surface_sync (cairo_surface_t *target, int x, int y)
{
cairo_rectangle_int_t extents;
@@ -751,7 +751,7 @@ _cairo_surface_observer_paint (void *abstract_surface,
if (unlikely (status))
return status;
- sync (surface->target, x, y);
+ _cairo_surface_sync (surface->target, x, y);
t = _cairo_time_get_delta (t);
add_record_paint (&surface->log, surface->target, op, source, clip, t);
@@ -837,7 +837,7 @@ _cairo_surface_observer_mask (void *abstract_surface,
if (unlikely (status))
return status;
- sync (surface->target, x, y);
+ _cairo_surface_sync (surface->target, x, y);
t = _cairo_time_get_delta (t);
add_record_mask (&surface->log,
@@ -944,7 +944,7 @@ _cairo_surface_observer_fill (void *abstract_surface,
if (unlikely (status))
return status;
- sync (surface->target, x, y);
+ _cairo_surface_sync (surface->target, x, y);
t = _cairo_time_get_delta (t);
add_record_fill (&surface->log,
@@ -1063,7 +1063,7 @@ _cairo_surface_observer_stroke (void *abstract_surface,
if (unlikely (status))
return status;
- sync (surface->target, x, y);
+ _cairo_surface_sync (surface->target, x, y);
t = _cairo_time_get_delta (t);
add_record_stroke (&surface->log,
@@ -1183,7 +1183,7 @@ _cairo_surface_observer_glyphs (void *abstract_surface,
if (unlikely (status))
return status;
- sync (surface->target, x, y);
+ _cairo_surface_sync (surface->target, x, y);
t = _cairo_time_get_delta (t);
add_record_glyphs (&surface->log,
diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
index 84b46d89a..fb40699dc 100644
--- a/src/cairo-xlib-surface-shm.c
+++ b/src/cairo-xlib-surface-shm.c
@@ -453,7 +453,7 @@ static void send_event(cairo_xlib_display_t *display,
display->shm->last_event = ev.serial;
}
-static void sync (cairo_xlib_display_t *display)
+static void _cairo_xlib_display_sync (cairo_xlib_display_t *display)
{
cairo_xlib_shm_info_t *info;
struct pqueue *pq = &display->shm->info;
@@ -949,7 +949,7 @@ _cairo_xlib_surface_update_shm (cairo_xlib_surface_t *surface)
XChangeGC (display->display, gc, GCSubwindowMode, &gcv);
}
- sync (display);
+ _cairo_xlib_display_sync (display);
shm->active = 0;
shm->idle--;