Skip to content

O
opencv
Commit 16044d1a authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

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

parent 64814321
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/ts/include/opencv2/ts/ts_gtest.h
View file @ 16044d1a
......@@ -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, <regex.h> needs someone to define size_t, and
// won't compile otherwise. We can #include it here as we already
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment