about summary refs log tree commit diff
path: root/src/libutil/util.hh
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-03-19T16·09-0500
committerWill Dietz <w@wdtz.org>2018-03-19T16·18-0500
commit9b33201e727b8c1ac0eef08624ebff5b60c9ffd7 (patch)
tree79fa29810e7a31a5b3203136a69fee2c32c7bf32 /src/libutil/util.hh
parentae299ab47a6170fb880f962c256991a9a205ceaf (diff)
util: rename stdout/stdin members to avoid conflicts w/standard macro
(cherry picked from commit c389a7fb617ed7bcd617efa68c6a48c00405310d)
Diffstat (limited to 'src/libutil/util.hh')
-rw-r--r--src/libutil/util.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 1ea1027ac0ac..85952535db29 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -260,8 +260,8 @@ struct RunOptions
     bool searchPath = true;
     Strings args;
     std::experimental::optional<std::string> input;
-    Source * stdin = nullptr;
-    Sink * stdout = nullptr;
+    Source * standardIn = nullptr;
+    Sink * standardOut = nullptr;
     bool _killStderr = false;
 
     RunOptions(const Path & program, const Strings & args)