Skip to content

Commit 6b9c9ee

Browse files
author
git apple-llvm automerger
committed
Merge commit '9ebb0abb02b1' from llvm.org/release/21.x into stable/21.x
2 parents d56dddc + 9ebb0ab commit 6b9c9ee

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lldb/source/Host/windows/MainLoopWindows.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "llvm/Config/llvm-config.h"
1515
#include "llvm/Support/WindowsError.h"
1616
#include <algorithm>
17+
#include <atomic>
1718
#include <cassert>
1819
#include <ctime>
1920
#include <io.h>

lldb/source/Host/windows/PipeWindows.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ llvm::Expected<size_t> PipeWindows::Read(void *buf, size_t size,
279279
return Status(failure_error, eErrorTypeWin32).takeError();
280280

281281
DWORD timeout_msec =
282-
timeout ? ceil<std::chrono::milliseconds>(*timeout).count() : INFINITE;
282+
timeout ? std::chrono::ceil<std::chrono::milliseconds>(*timeout).count()
283+
: INFINITE;
283284
DWORD wait_result =
284285
::WaitForSingleObject(m_read_overlapped.hEvent, timeout_msec);
285286
if (wait_result != WAIT_OBJECT_0) {
@@ -324,7 +325,8 @@ llvm::Expected<size_t> PipeWindows::Write(const void *buf, size_t size,
324325
return Status(failure_error, eErrorTypeWin32).takeError();
325326

326327
DWORD timeout_msec =
327-
timeout ? ceil<std::chrono::milliseconds>(*timeout).count() : INFINITE;
328+
timeout ? std::chrono::ceil<std::chrono::milliseconds>(*timeout).count()
329+
: INFINITE;
328330
DWORD wait_result =
329331
::WaitForSingleObject(m_write_overlapped.hEvent, timeout_msec);
330332
if (wait_result != WAIT_OBJECT_0) {

0 commit comments

Comments
 (0)