From 03fb85f17956a6968610c856668a9203fb2a1b3c Mon Sep 17 00:00:00 2001 From: Adeel Date: Thu, 9 Feb 2017 20:11:00 +0500 Subject: [PATCH] update fix for #8105 (compiling with mingw32) taken from https://github.com/google/googletest/pull/856 --- modules/ts/include/opencv2/ts/ts_gtest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ts/include/opencv2/ts/ts_gtest.h b/modules/ts/include/opencv2/ts/ts_gtest.h index 2153381ab9..ea1e62c338 100644 --- a/modules/ts/include/opencv2/ts/ts_gtest.h +++ b/modules/ts/include/opencv2/ts/ts_gtest.h @@ -720,7 +720,7 @@ # include # endif // In order to avoid having to include , use forward declaration -# if GTEST_OS_WINDOWS_MINGW +#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR) // MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two // separate (equivalent) structs, instead of using typedef typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION; -- GitLab