From 16044d1ad59ca03399a6948c60b15aa7958b2576 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 21 Apr 2011 12:54:16 +0000 Subject: [PATCH] Android compatibility fix: avoid regex.h include to be able to build OpenCV for platform android-5 --- modules/ts/include/opencv2/ts/ts_gtest.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ts/include/opencv2/ts/ts_gtest.h b/modules/ts/include/opencv2/ts/ts_gtest.h index c0a1902e25..1832ecb8d2 100644 --- a/modules/ts/include/opencv2/ts/ts_gtest.h +++ b/modules/ts/include/opencv2/ts/ts_gtest.h @@ -316,8 +316,8 @@ #define GTEST_OS_AIX 1 #endif // __CYGWIN__ -#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \ - GTEST_OS_SOLARIS || GTEST_OS_AIX +#if (GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \ + GTEST_OS_SOLARIS || GTEST_OS_AIX) && !defined(ANDROID) // On some platforms, needs someone to define size_t, and // won't compile otherwise. We can #include it here as we already