Fix compilation when stdout is a macro

NixOS · Dec 22, 2021 · 4220db4 · 4220db4
1 parent 5ef3e2f
commit 4220db4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
@@ -427,7 +427,7 @@ RunPager::RunPager()
     });
 
     pid.setKillSignal(SIGINT);
-    stdout = fcntl(STDOUT_FILENO, F_DUPFD_CLOEXEC, 0);
+    out = fcntl(STDOUT_FILENO, F_DUPFD_CLOEXEC, 0);
     if (dup2(toPager.writeSide.get(), STDOUT_FILENO) == -1)
         throw SysError("dupping stdout");
 }
@@ -438,7 +438,7 @@ RunPager::~RunPager()
     try {
         if (pid != -1) {
             std::cout.flush();
-            dup2(stdout, STDOUT_FILENO);
+            dup2(out, STDOUT_FILENO);
             pid.wait();
         }
     } catch (...) {

diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
@@ -88,7 +88,7 @@ public:
 
 private:
     Pid pid;
-    int stdout;
+    int out;
 };
 
 extern volatile ::sig_atomic_t blockInt;