Merge pull request #2844 from mstorsjo:windows-includes
PiperOrigin-RevId: 310910168
This commit is contained in:
commit
77b8d767d8
@ -81,13 +81,11 @@
|
||||
|
||||
#elif GTEST_OS_WINDOWS // We are on Windows proper.
|
||||
|
||||
# include <Windows.h> // NOLINT
|
||||
# include <windows.h> // NOLINT
|
||||
# undef min
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# include <crtdbg.h> // NOLINT
|
||||
# include <debugapi.h> // NOLINT
|
||||
#endif
|
||||
|
||||
# include <io.h> // NOLINT
|
||||
|
Loading…
x
Reference in New Issue
Block a user