diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-25 15:39:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-25 15:40:02 (GMT) |
| commit | b11c8c45f977a4d69bc5a056341b57e17a602694 (patch) | |
| tree | 42f545e8385bb1da68b7799a1fc35e0ebd48377c /Source/cmUVProcessChain.h | |
| parent | 4c4cd1246e5b66f731c6e145332ed75bf24fd045 (diff) | |
| parent | adb3e13d323aeb19c3824112cfa712cc122db3b4 (diff) | |
| download | CMake-b11c8c45f977a4d69bc5a056341b57e17a602694.zip CMake-b11c8c45f977a4d69bc5a056341b57e17a602694.tar.gz CMake-b11c8c45f977a4d69bc5a056341b57e17a602694.tar.bz2 | |
Merge topic 'cmuvprocesschain'
adb3e13d32 cmUVProcessChain: Tolerate fileno() of invalid FILE stream
b6e4e4babc cmUVProcessChain: Simplify SetExternalStream usage
116bb2b70f cmUVProcessChain: Simplify builder initialization
d32c30906a Tests: Add missing include in testUVProcessChainHelper on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9181
Diffstat (limited to 'Source/cmUVProcessChain.h')
| -rw-r--r-- | Source/cmUVProcessChain.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmUVProcessChain.h b/Source/cmUVProcessChain.h index 139588b..65816e2 100644 --- a/Source/cmUVProcessChain.h +++ b/Source/cmUVProcessChain.h @@ -7,6 +7,7 @@ #include <array> #include <cstddef> // IWYU pragma: keep #include <cstdint> +#include <cstdio> #include <memory> #include <string> #include <utility> @@ -36,6 +37,7 @@ public: cmUVProcessChainBuilder& SetBuiltinStream(Stream stdio); cmUVProcessChainBuilder& SetMergedBuiltinStreams(); cmUVProcessChainBuilder& SetExternalStream(Stream stdio, int fd); + cmUVProcessChainBuilder& SetExternalStream(Stream stdio, FILE* stream); cmUVProcessChainBuilder& SetWorkingDirectory(std::string dir); uv_loop_t* GetLoop() const; @@ -54,8 +56,8 @@ private: struct StdioConfiguration { - StdioType Type; - int FileDescriptor; + StdioType Type = None; + int FileDescriptor = -1; }; struct ProcessConfiguration |