From 93b202697a80218c3fffef326323a68f572e56c3 Mon Sep 17 00:00:00 2001 From: Mercyful Date: Fri, 18 Mar 2016 08:06:35 -0500 Subject: [PATCH] Fix for setenv in Mingw32. #if _MSC_VER doesn't catch Mingw32 Builds. added || _WIN32. --- test/gmock-1.7.0/gtest/test/gtest_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/gmock-1.7.0/gtest/test/gtest_unittest.cc b/test/gmock-1.7.0/gtest/test/gtest_unittest.cc index 0cab07d..5a27273 100644 --- a/test/gmock-1.7.0/gtest/test/gtest_unittest.cc +++ b/test/gmock-1.7.0/gtest/test/gtest_unittest.cc @@ -447,7 +447,7 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test { // tzset() distinguishes between the TZ variable being present and empty // and not being present, so we have to consider the case of time_zone // being NULL. -#if _MSC_VER +#if _MSC_VER || _WIN32 // ...Unless it's MSVC, whose standard library's _putenv doesn't // distinguish between an empty and a missing variable. const std::string env_var =