mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-28 05:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

stratosphere: fix building with latest libnx

Browse source
This commit is contained in:
Michael Scire 2020-03-18 00:14:26 -07:00
parent 4759c2f92c
commit 067fe2d10f
9 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/source/os/impl/os_inter_process_event.cpp
View file

@ -118,7 +118,7 @@ namespace ams::os::impl {
while (true) {
/* Continuously wait, until success. */
R_TRY_CATCH(svcWaitSynchronizationSingle(handle, U64_MAX)) {
R_TRY_CATCH(svcWaitSynchronizationSingle(handle, std::numeric_limits<u64>::max())) {
R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;

2
libraries/libstratosphere/source/os/impl/os_waitable_holder_base.hpp
View file

@ -38,7 +38,7 @@ namespace ams::os::impl {
virtual Handle GetHandle() const = 0;
/* Gets the amount of time remaining until this wakes up. */
virtual u64 GetWakeupTime() const {
return U64_MAX;
return std::numeric_limits<u64>::max();
}
/* Interface with manager. */

2
libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
View file

@ -51,7 +51,7 @@ namespace ams::os::impl{
WaitableHolderBase *objects[MaximumHandleCount];
const size_t count = this->BuildHandleArray(object_handles, objects);
const u64 end_time = infinite ? U64_MAX : armTicksToNs(armGetSystemTick());
const u64 end_time = infinite ? std::numeric_limits<u64>::max() : armTicksToNs(armGetSystemTick());
while (true) {
this->current_time = armTicksToNs(armGetSystemTick());

2
libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.hpp
View file

@ -44,7 +44,7 @@ namespace ams::os::impl {
public:
/* Wait. */
WaitableHolderBase *WaitAny() {
return this->WaitAnyImpl(true, U64_MAX);
return this->WaitAnyImpl(true, std::numeric_limits<u64>::max());
}
WaitableHolderBase *TryWaitAny() {

2
libraries/libstratosphere/source/os/os_interrupt_event.cpp
View file

@ -49,7 +49,7 @@ namespace ams::os {
while (true) {
/* Continuously wait, until success. */
R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), U64_MAX)) {
R_TRY_CATCH(svcWaitSynchronizationSingle(this->handle.Get(), std::numeric_limits<u64>::max())) {
R_CATCH(svc::ResultCancelled) { continue; }
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;

4
libraries/libstratosphere/source/sf/hipc/sf_hipc_api.cpp
View file

@ -23,9 +23,9 @@ namespace ams::sf::hipc {
s32 unused_index;
if (message_buf == armGetTls()) {
/* Consider: AMS_ABORT_UNLESS(message_buf_size == TlsMessageBufferSize); */
return svcReplyAndReceive(&unused_index, &session_handle, 1, INVALID_HANDLE, U64_MAX);
return svcReplyAndReceive(&unused_index, &session_handle, 1, INVALID_HANDLE, std::numeric_limits<u64>::max());
} else {
return svcReplyAndReceiveWithUserBuffer(&unused_index, message_buf, message_buf_size, &session_handle, 1, INVALID_HANDLE, U64_MAX);
return svcReplyAndReceiveWithUserBuffer(&unused_index, message_buf, message_buf_size, &session_handle, 1, INVALID_HANDLE, std::numeric_limits<u64>::max());
}
}