From fe735a698657a7fffe6b5062c6bf5b13b6a6950c Mon Sep 17 00:00:00 2001
From: Gaspard Petit <gpetit@eidosmontreal.com>
Date: Sat, 11 Jun 2022 10:26:41 -0400
Subject: [PATCH] Move declaration of kStdOutFileNo and kStdErrFileno

Move declaration of kStdOutFileNo and kStdErrFileno closer to where they are used to avoid having to guard for GTEST_HAS_STREAM_REDIRECTION twice
---
 googletest/src/gtest-port.cc | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc
index 7cf6d413..cf66d9e8 100644
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@@ -90,17 +90,6 @@
 namespace testing {
 namespace internal {
 
-#if GTEST_HAS_STREAM_REDIRECTION
-#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 // GTEST_HAS_STREAM_REDIRECTION
-
 #if GTEST_OS_LINUX || GTEST_OS_GNU_HURD
 
 namespace {
@@ -1179,6 +1168,15 @@ static std::string GetCapturedStream(CapturedStream** captured_stream) {
   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
+
 // Starts capturing stdout.
 void CaptureStdout() {
   CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);