Android compatibility fix: avoid regex.h include to be able to build OpenCV for platform android-5
This commit is contained in:
parent
64814321ee
commit
16044d1ad5
@ -316,8 +316,8 @@
|
|||||||
#define GTEST_OS_AIX 1
|
#define GTEST_OS_AIX 1
|
||||||
#endif // __CYGWIN__
|
#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
|
// On some platforms, <regex.h> needs someone to define size_t, and
|
||||||
// won't compile otherwise. We can #include it here as we already
|
// won't compile otherwise. We can #include it here as we already
|
||||||
|
Loading…
x
Reference in New Issue
Block a user