From: Ondřej Surý Date: Wed, 30 Jan 2019 14:50:35 +0000 (+0100) Subject: Fix Centos 6 build by explicitly casting to __typeof__(obj) in atomic_compare_exchang... X-Git-Tag: v9.13.6~23^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27eb6189a82e075f3d469fd2446c1afc7e6f64f1;p=thirdparty%2Fbind9.git Fix Centos 6 build by explicitly casting to __typeof__(obj) in atomic_compare_exchange_strong shim function --- diff --git a/lib/isc/unix/include/isc/stdatomic.h b/lib/isc/unix/include/isc/stdatomic.h index 4b9e1f1ec99..532d1188888 100644 --- a/lib/isc/unix/include/isc/stdatomic.h +++ b/lib/isc/unix/include/isc/stdatomic.h @@ -127,8 +127,10 @@ typedef bool atomic_bool; ({ \ __typeof__(obj) __v; \ _Bool __r; \ - __v = __sync_val_compare_and_swap(obj, *(expected), desired); \ - __r = *(expected) == __v; \ + __v = (__typeof__(obj))__sync_val_compare_and_swap(obj, \ + *(expected), \ + desired); \ + __r = ((__typeof__(obj))*(expected) == __v); \ *(expected) = __v; \ __r; \ })