[opencv] 24/71: Enabled build with LLVM libc++ for Android.

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.

commit f29fd63f13d9b5995d8e250673132a27f0659e9b
Author: Alexander Smorkalov <alexander.smorkalov at itseez.com>
Date:   Fri May 13 10:41:06 2016 +0300

    Enabled build with LLVM libc++ for Android.
---
 modules/core/include/opencv2/core/operations.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp
index 0ae51c6..7127f0c 100644
--- a/modules/core/include/opencv2/core/operations.hpp
+++ b/modules/core/include/opencv2/core/operations.hpp
@@ -46,9 +46,9 @@
 #ifndef SKIP_INCLUDES
   #include <string.h>
   #include <limits.h>
+  #include <stddef.h>
 #endif // SKIP_INCLUDES
 
-
 #ifdef __cplusplus
 
 /////// exchange-add operation for atomic operations on reference counters ///////
@@ -66,7 +66,7 @@
 
     #if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \
         defined __i686__ || defined __MMX__ || defined __SSE__  || defined __ppc__) || \
-        (defined __GNUC__ && defined _STLPORT_MAJOR) || \
+        defined _STLPORT_MAJOR || defined _LIBCPP_VERSION || \
         defined __EMSCRIPTEN__
 
       #define CV_XADD __sync_fetch_and_add

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git