diff options
| author | Aaron Dierking <aarond@fb.com> | 2018-10-11 16:35:22 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-11 16:44:07 (GMT) |
| commit | e7327c13f6f20dff89a3f9e434eddce838564189 (patch) | |
| tree | edd065c267ffb58258eb88cc7ac635e0d9783269 /googletest/src | |
| parent | bc6a4ce380862ba274a3b7b2a33b295a858eb0a9 (diff) | |
| download | googletest-e7327c13f6f20dff89a3f9e434eddce838564189.zip googletest-e7327c13f6f20dff89a3f9e434eddce838564189.tar.gz googletest-e7327c13f6f20dff89a3f9e434eddce838564189.tar.bz2 | |
Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5b363f46c6ad448ad1bce9d6e97e53a
Accepts #1889
PiperOrigin-RevId: 216709878
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest-port.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index 91f285c..aa98ddb 100644 --- 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 |