Merge branch 'v0.22.x'

2021-03-10 21:06:12 +01:00
parent ee720064a7 25b0194036
commit 25354b9d8c
16 changed files with 565 additions and 352 deletions
--- a/src/io/FileDescriptor.cxx
+++ b/src/io/FileDescriptor.cxx
@@ -172,7 +172,15 @@ FileDescriptor::CreatePipe(FileDescriptor &r, FileDescriptor &w) noexcept
 #endif
 }

-#ifndef _WIN32
+#ifdef _WIN32
+
+void
+FileDescriptor::SetBinaryMode() noexcept
+{
+	_setmode(fd, _O_BINARY);
+}
+
+#else // !_WIN32

 bool
 FileDescriptor::CreatePipeNonBlock(FileDescriptor &r,