Skip to content

GitLab

Commit 77b8d767 authored by Andy Getz's avatar Andy Getz
Browse files

Merge pull request #2844 from mstorsjo:windows-includes 

PiperOrigin-RevId: 310910168
parents fe5300eb d86e9e23
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
googletest/src/gtest.cc
View file @ 77b8d767
...@@ -81,13 +81,11 @@ ...@@ -81,13 +81,11 @@
#elif GTEST_OS_WINDOWS // We are on Windows proper. #elif GTEST_OS_WINDOWS // We are on Windows proper.
# include <Windows.h> // NOLINT
# include <windows.h> // NOLINT # include <windows.h> // NOLINT
# undef min # undef min
#ifdef _MSC_VER #ifdef _MSC_VER
# include <crtdbg.h> // NOLINT # include <crtdbg.h> // NOLINT
# include <debugapi.h> // NOLINT
#endif #endif
# include <io.h> // NOLINT # include <io.h> // NOLINT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment