Android compatibility fix: avoid regex.h include to be able to build OpenCV for platform android-5

14 years ago · 16044d1ad5
parent 64814321ee
commit 16044d1ad5
1 changed files with 2 additions and 2 deletions
--- 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 || \
+#if (GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \
-    GTEST_OS_SOLARIS || GTEST_OS_AIX
+    GTEST_OS_SOLARIS || GTEST_OS_AIX) && !defined(ANDROID)
 // On some platforms, <regex.h> needs someone to define size_t, and
 // won't compile otherwise.  We can #include it here as we already