From e7327c13f6f20dff89a3f9e434eddce838564189 Mon Sep 17 00:00:00 2001 From: Aaron Dierking Date: Thu, 11 Oct 2018 12:35:22 -0400 Subject: Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5b363f46c6ad448ad1bce9d6e97e53a Accepts #1889 PiperOrigin-RevId: 216709878 --- googletest/src/gtest-port.cc | 3 +++ 1 file changed, 3 insertions(+) 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 # include # include // Used in ThreadLocal. +# ifdef _MSC_VER +# include +# endif // _MSC_VER #else # include #endif // GTEST_OS_WINDOWS -- cgit v0.12