From de649f07f1f8fdeb998a0b049759f4f7363e25d2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 14 Jan 2013 00:26:43 -0600 Subject: [PATCH] Fix residuals from fontconfig changes --- src/hb-atomic-private.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh index 75fbcd6..b909bc8 100644 --- a/src/hb-atomic-private.hh +++ b/src/hb-atomic-private.hh @@ -104,11 +104,11 @@ typedef int hb_atomic_int_t; #include #include -typedef unsigned int fc_atomic_int_t; -#define fc_atomic_int_add(AI, V) ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V)) +typedef unsigned int hb_atomic_int_t; +#define hb_atomic_int_add(AI, V) ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V)) -#define fc_atomic_ptr_get(P) ( ({__machine_rw_barrier ();}), (void *) *(P)) -#define fc_atomic_ptr_cmpexch(P,O,N) ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((P), (O), (N)) == (void *) (O) ? FcTrue : FcFalse) +#define hb_atomic_ptr_get(P) ( ({__machine_rw_barrier ();}), (void *) *(P)) +#define hb_atomic_ptr_cmpexch(P,O,N) ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false) #elif !defined(HB_NO_MT) -- 2.7.4