]> git-server-git.apps.pok.os.sepia.ceph.com Git - googletest.git/commitdiff
Merge pull request #3863 from eidosmontreal:fix_unused-variable_warning
authorCopybara-Service <copybara-worker@google.com>
Tue, 14 Jun 2022 20:24:55 +0000 (13:24 -0700)
committerCopybara-Service <copybara-worker@google.com>
Tue, 14 Jun 2022 20:24:55 +0000 (13:24 -0700)
PiperOrigin-RevId: 454940948
Change-Id: Ic87dadfe9c6fc8882b0f425aa2056f0cc7a90b55

1  2 
googletest/src/gtest-port.cc

index 73a1115a68d34034085d911380c05b86f957047d,cf66d9e80d79a5c75bc467a27ed10dee6cf7f4f6..d797fe4d5866c7da296a64428ad4da352c1e7fe4
@@@ -1176,6 -1167,15 +1167,15 @@@ static std::string GetCapturedStream(Ca
  
    return content;
  }
 -#endif  // _MSC_VER
+ #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  // defined(_MSC_VER) || defined(__BORLANDC__)
  
  // Starts capturing stdout.
  void CaptureStdout() {