diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-22 18:58:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-05-22 18:58:43 (GMT) |
| commit | d98df689abe69a90e94bb2a6af763e0e4fc18d08 (patch) | |
| tree | 504dba2498beffc31396af060cd627cfd6857942 /Utilities | |
| parent | cbe26bdeda35e570d8fcd99ad3b38e1cea2e38bd (diff) | |
| parent | a5903828501ce21c81d49d49f80704b714a8bffc (diff) | |
| download | CMake-d98df689abe69a90e94bb2a6af763e0e4fc18d08.zip CMake-d98df689abe69a90e94bb2a6af763e0e4fc18d08.tar.gz CMake-d98df689abe69a90e94bb2a6af763e0e4fc18d08.tar.bz2 | |
Merge branch 'libuv-win-process-no-extra-stdio'
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibuv/src/win/process.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c index 11cf5b2..5cf9fb8 100644 --- a/Utilities/cmlibuv/src/win/process.c +++ b/Utilities/cmlibuv/src/win/process.c @@ -1083,8 +1083,15 @@ int uv_spawn(uv_loop_t* loop, startup.lpTitle = NULL; startup.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; +#if 1 + /* cmake does not need libuv's support for passing file descriptors >= 3 + to the MSVC C run-time in the child. Avoid using reserved members. */ + startup.cbReserved2 = 0; + startup.lpReserved2 = NULL; +#else startup.cbReserved2 = uv__stdio_size(process->child_stdio_buffer); startup.lpReserved2 = (BYTE*) process->child_stdio_buffer; +#endif startup.hStdInput = uv__stdio_handle(process->child_stdio_buffer, 0); startup.hStdOutput = uv__stdio_handle(process->child_stdio_buffer, 1); |