diff options
| author | 2016-09-03 14:54:15 +0200 | |
|---|---|---|
| committer | 2016-09-03 14:54:15 +0200 | |
| commit | 22df94bf67747dca94f6e46f7e7a9d2d2ef210a7 (patch) | |
| tree | 062ae4bb295e243062e857eb8284d31712db8999 /3rdparty | |
| parent | 854ac627c2c9c774f7c813846b345034503116d0 (diff) | |
Fix benchmarks build and google test build (nw)
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h b/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h index 92f4c11c4f6..2d59641fed4 100644 --- a/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h +++ b/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h @@ -396,16 +396,10 @@ # include <io.h> # endif // In order to avoid having to include <windows.h>, use forward declaration -#if GTEST_OS_WINDOWS_MINGW -// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two -// separate (equivalent) structs, instead of using typedef -typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION; -#else // Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. // This assumption is verified by // WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION. typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; -#endif #else // This assumes that non-Windows OSes provide unistd.h. For OSes where this // is not the case, we need to include headers that provide the functions |
