Skip to content

Commit 04ae86c

Browse files
committed
Merge remote-tracking branch 'origin/main' into next
2 parents c96646e + 9c3143d commit 04ae86c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

stdlib/public/Concurrency/DispatchGlobalExecutor.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,14 @@ clock_and_value_to_time(int clock, long long sec, long long nsec) {
319319
.tv_sec = sec,
320320
.tv_nsec = static_cast<long>(nsec)
321321
};
322+
#elif defined(__APPLE__)
323+
struct timespec ts = {
324+
.tv_sec = static_cast<__darwin_time_t>(sec),
325+
.tv_nsec = nsec
326+
};
322327
#else
323328
struct timespec ts = {
324-
.tv_sec = sec,
329+
.tv_sec = static_cast<long>(sec),
325330
.tv_nsec = nsec
326331
};
327332
#endif

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set TMPDIR=%BuildRoot%\tmp
6060
set NINJA_STATUS=[%%f/%%t][%%p][%%es]
6161

6262
:: Build the -Test argument, if any, by subtracting skipped tests
63-
set TestArg=-Test lld,lldb,swift,dispatch,foundation,xctest,swift-format,sourcekit-lsp,
63+
set TestArg=-Test lld,lldb,swift,dispatch,foundation,xctest,swift-format,sourcekit-lsp,swiftpm,
6464
for %%I in (%SKIP_TESTS%) do (call set TestArg=%%TestArg:%%I,=%%)
6565
if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )
6666

0 commit comments

Comments
 (0)