diff options
-rw-r--r-- | 3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h | 6 | ||||
-rw-r--r-- | scripts/src/benchmarks.lua | 6 |
2 files changed, 3 insertions, 9 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 diff --git a/scripts/src/benchmarks.lua b/scripts/src/benchmarks.lua index a643939d6db..68ca0714c84 100644 --- a/scripts/src/benchmarks.lua +++ b/scripts/src/benchmarks.lua @@ -29,15 +29,15 @@ project "benchmark" MAME_DIR .. "3rdparty/benchmark/src/benchmark.cc", MAME_DIR .. "3rdparty/benchmark/src/colorprint.cc", MAME_DIR .. "3rdparty/benchmark/src/commandlineflags.cc", + MAME_DIR .. "3rdparty/benchmark/src/complexity.cc", MAME_DIR .. "3rdparty/benchmark/src/console_reporter.cc", MAME_DIR .. "3rdparty/benchmark/src/csv_reporter.cc", MAME_DIR .. "3rdparty/benchmark/src/json_reporter.cc", - MAME_DIR .. "3rdparty/benchmark/src/log.cc", MAME_DIR .. "3rdparty/benchmark/src/reporter.cc", MAME_DIR .. "3rdparty/benchmark/src/sleep.cc", MAME_DIR .. "3rdparty/benchmark/src/string_util.cc", - MAME_DIR .. "3rdparty/benchmark/src/sysinfo.cc", - MAME_DIR .. "3rdparty/benchmark/src/walltime.cc", + MAME_DIR .. "3rdparty/benchmark/src/sysinfo.cc", + MAME_DIR .. "3rdparty/benchmark/src/timers.cc", MAME_DIR .. "3rdparty/benchmark/src/re_std.cc", } |