Merge 41fc9745d4 into 658c6390a5

Accepts #1889 PiperOrigin-RevId: 216709878
2018-10-11 12:35:22 -04:00 · 2018-10-11 12:35:22 -04:00 · e7327c13f6
commit e7327c13f6
parent bc6a4ce380
1 changed files with 3 additions and 0 deletions
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@ -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