Merge pull request #8165

An error occurred

from AdeelH:master

8 years ago · 642e4d97a4
parent a347569350 03fb85f179
commit 642e4d97a4
1 changed files with 1 additions and 1 deletions
--- a/modules/ts/include/opencv2/ts/ts_gtest.h
+++ b/modules/ts/include/opencv2/ts/ts_gtest.h
@ -720,7 +720,7 @@
 #  include <io.h>
 # endif
 // In order to avoid having to include <windows.h>, 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;