From f4c219bacf5302933d7da7e30bbf2ca94e1362d0 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Thu, 26 Feb 2015 14:18:30 +0100 Subject: [PATCH] fix conflicting types for 'sync' on AIX, bug#89338 --- src/cairo-surface-observer.c | 12 ++++++------ src/cairo-xlib-surface-shm.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cairo-surface-observer.c b/src/cairo-surface-observer.c index 6721bf5..52b0136 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 84b46d8..fb40699 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--; -- 2.1.0