Merge pull request #2844 from mstorsjo:windows-includes

PiperOrigin-RevId: 310910168
This commit is contained in:
Andy Getz 2020-05-13 00:39:48 -04:00
commit 77b8d767d8

View File

@ -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