From: Copybara-Service <copybara-worker@google.com>
Date: Tue, 14 Jun 2022 20:24:55 +0000 (-0700)
Subject: Merge pull request #3863 from eidosmontreal:fix_unused-variable_warning
X-Git-Tag: release-1.12.0~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=191ca1f3a9262b90a586ae2c2e8c742c3d867801;p=googletest.git

Merge pull request #3863 from eidosmontreal:fix_unused-variable_warning

PiperOrigin-RevId: 454940948
Change-Id: Ic87dadfe9c6fc8882b0f425aa2056f0cc7a90b55
---

191ca1f3a9262b90a586ae2c2e8c742c3d867801
diff --cc googletest/src/gtest-port.cc
index 73a1115,cf66d9e..d797fe4
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@@@ -1176,6 -1167,15 +1167,15 @@@ static std::string GetCapturedStream(Ca
  
    return content;
  }
+ 
+ #if defined(_MSC_VER) || defined(__BORLANDC__)
+ // MSVC and C++Builder do not provide a definition of STDERR_FILENO.
+ const int kStdOutFileno = 1;
+ const int kStdErrFileno = 2;
+ #else
+ const int kStdOutFileno = STDOUT_FILENO;
+ const int kStdErrFileno = STDERR_FILENO;
 -#endif  // _MSC_VER
++#endif  // defined(_MSC_VER) || defined(__BORLANDC__)
  
  // Starts capturing stdout.
  void CaptureStdout() {