src/hb-atomic-private.hh | 6 +++++- src/hb-mutex-private.hh | 7 ++++++- src/hb-set-private.hh | 1 - 3 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 45a8b46f478d4aa63ae5df74b6bb28ebdd7521ac Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 8 12:49:38 2015 -0700 Allow implementing atomic and mutex ops in config Motivated by https://github.com/behdad/harfbuzz/pull/92 diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh index e6738b7..6fa86d3 100644 --- a/src/hb-atomic-private.hh +++ b/src/hb-atomic-private.hh @@ -39,7 +39,11 @@ /* We need external help for these */ -#if 0 +#if defined(hb_atomic_int_add) \ + && defined(hb_atomic_ptr_get) \ + && defined(hb_atomic_ptr_cmpexch) + +/* Defined externally, i.e. in config.h */ #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) diff --git a/src/hb-mutex-private.hh b/src/hb-mutex-private.hh index a8ea39c..64c552f 100644 --- a/src/hb-mutex-private.hh +++ b/src/hb-mutex-private.hh @@ -39,7 +39,12 @@ /* We need external help for these */ -#if 0 +#if defined(hb_mutex_impl_init) \ + && defined(hb_mutex_impl_lock) \ + && defined(hb_mutex_impl_unlock) \ + && defined(hb_mutex_impl_finish) + +/* Defined externally, i.e. in config.h */ #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) commit 3fe4e92bc5ff09d84c6763cedf06ce80d15a5fb2 Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 8 12:49:23 2015 -0700 Minor diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh index acba4e9..bba4015 100644 --- a/src/hb-set-private.hh +++ b/src/hb-set-private.hh @@ -354,7 +354,6 @@ struct hb_frozen_set_t return; unsigned int min = set.get_min (); const elt_t &min_elt = set.elt (min); - const elt_t &max_elt = set.elt (max); start = min & ~MASK; count = max - start + 1; _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
