From aaf69c422ee03e11b362df193411533c3bcc609d Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 25 Mar 2013 18:06:02 +0400 Subject: [PATCH] Fix clang build for Android (CV_XADD) --- modules/core/include/opencv2/core/cvdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index 00d33b19d0..133b4ecc17 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -422,7 +422,7 @@ CV_INLINE int cvIsInf( double value ) # define CV_XADD(addr, delta) __atomic_fetch_add((_Atomic(int)*)(addr), delta, 4) # endif # else -# ifdef __ATOMIC_ACQ_REL +# if defined __ATOMIC_ACQ_REL && !defined __clang__ // version for gcc >= 4.7 # define CV_XADD(addr, delta) __atomic_fetch_add(addr, delta, __ATOMIC_ACQ_REL) # else