Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5b363f46c6ad448ad1bce9d6e97e53a

Accepts #1889

PiperOrigin-RevId: 216709878
This commit is contained in:
Aaron Dierking 2018-10-11 12:35:22 -04:00 committed by Gennadiy Civil
parent bc6a4ce380
commit e7327c13f6

View File

@ -41,6 +41,9 @@
# include <io.h>
# include <sys/stat.h>
# include <map> // Used in ThreadLocal.
# ifdef _MSC_VER
# include <crtdbg.h>
# endif // _MSC_VER
#else
# include <unistd.h>
#endif // GTEST_OS_WINDOWS