Skip to content

Commit 99be52c

Browse files
committed
Fixing build issues after latest Linux changes.
1 parent 80aa51e commit 99be52c

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

source/code/core/tasks/private/task_thread_utils.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ namespace ice::current_thread
88
void sleep(Tms ms) noexcept
99
{
1010
#if ISP_WINDOWS
11-
SleepEx(ms.value, 0);
12-
#elif ISP_LINUX
11+
ICE_ASSERT_CORE(ms.value <= ice::u32_max);
12+
SleepEx(DWORD(ms.value), 0);
13+
#elif ISP_UNIX
1314
Tus const us = ms;
1415
usleep(us.value);
16+
#else
17+
ICE_ASSERT_CORE(false);
1518
#endif
1619
}
1720

source/code/core/tasks/public/ice/task_thread_utils.hxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#include <ice/base.hxx>
23
#include <ice/clock_types.hxx>
34

45
namespace ice::current_thread

source/code/core/utils/private/config_json.cxx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include <ice/config/config_builder.hxx>
55
#include <ice/config.hxx>
66

7+
#if ISP_WINDOWS
8+
#undef GetObject
9+
#endif
10+
711
ISC_WARNING_PUSH
812
ISCW_OPERATOR_DEPRECATED_BETWEEN_UNRELATED_ENUMERATIONS(ISCW_OP_DISABLE)
913
#include <rapidjson/document.h>

source/code/core/utils/private/native_file.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#if ISP_WEBAPP
2020
#include <emscripten.h>
21-
#include "native_file.hxx"
2221
#endif
2322

2423
namespace ice::native_file

0 commit comments

Comments
 (0)