Apply fix

Author: mcbarton

lib/Interpreter/Compatibility.h

@@ -10,6 +10,12 @@
 #include "clang/Basic/Version.h"
 #include "clang/Config/config.h"
 
+#ifdef _WIN32
+#define dup _dup
+#define dup2 _dup2
+#define close _close
+#endif
+
 #if CLANG_VERSION_MAJOR < 19
 #define Template_Deduction_Result Sema::TemplateDeductionResult
 #define Template_Deduction_Result_Success                                      \

lib/Interpreter/CppInterOp.cpp

@@ -3290,23 +3290,9 @@ namespace Cpp {
               }(),
               std::fclose),
           m_FD(FD) {
-      if (!m_TempFile) {
-        perror("StreamCaptureInfo: Unable to create temp file");
-        return;
-      }
-
-      m_DupFD = _dup(FD);
-
-      // Flush now or can drop the buffer when dup2 is called with Fd later.
-      // This seems only neccessary when piping stdout or stderr, but do it
-      // for ttys to avoid over complicated code for minimal benefit.
-      ::fflush(FD == STDOUT_FILENO ? stdout : stderr);
-      if (_dup2(_fileno(m_TempFile.get()), FD) < 0)
-        perror("StreamCaptureInfo:");
-    }
 #else
     StreamCaptureInfo(int FD) : m_TempFile(tmpfile(), std::fclose), m_FD(FD) {
-
+#endif
       if (!m_TempFile) {
         perror("StreamCaptureInfo: Unable to create temp file");
         return;
@@ -3318,11 +3304,9 @@ namespace Cpp {
       // This seems only neccessary when piping stdout or stderr, but do it
       // for ttys to avoid over complicated code for minimal benefit.
       ::fflush(FD == STDOUT_FILENO ? stdout : stderr);
-      if (dup2(fileno(m_TempFile.get()), FD) < 0)
+      if (dup2(_fileno(m_TempFile.get()), FD) < 0)
         perror("StreamCaptureInfo:");
     }
-#endif
-
     StreamCaptureInfo(const StreamCaptureInfo&) = delete;
     StreamCaptureInfo& operator=(const StreamCaptureInfo&) = delete;
     StreamCaptureInfo(StreamCaptureInfo&&) = delete;
@@ -3336,11 +3320,7 @@ namespace Cpp {
       assert(m_DupFD != -1 && "Multiple calls to GetCapturedString");
 
       fflush(nullptr);
-#if defined(_WIN32)
-      if (_dup2(m_DupFD, m_FD) < 0)
-#else
       if (dup2(m_DupFD, m_FD) < 0)
-#endif
         perror("StreamCaptureInfo:");
       // Go to the end of the file.
       if (fseek(m_TempFile.get(), 0L, SEEK_END) != 0)
@@ -3367,11 +3347,7 @@ namespace Cpp {
         content[newLen++] = '\0'; // Just to be safe.
 
       std::string result = content.get();
-#if defined(_WIN32)
-      _close(m_DupFD);
-#else
       close(m_DupFD);
-#endif
       m_DupFD = -1;
       return result;
     }