diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-05-09 16:26:17 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-05-09 16:26:17 +0200 |
| commit | 86f2f0bc36845ac45de315d9ba78c569b62d866a (patch) | |
| tree | f57a7dad767b125fa2b07775e5be8939306f1581 /externals/tz | |
| parent | cad9db48861c5bea2a0dac47448dfb4e0d1f84d5 (diff) | |
[*] Re-fix clang-cl building (#3940)
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3940
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'externals/tz')
| -rw-r--r-- | externals/tz/tz/tz.cpp | 11 | ||||
| -rw-r--r-- | externals/tz/tz/tz.h | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/externals/tz/tz/tz.cpp b/externals/tz/tz/tz.cpp index 04fa6cc8a9..3269d9cc1e 100644 --- a/externals/tz/tz/tz.cpp +++ b/externals/tz/tz/tz.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-FileCopyrightText: 1996 Arthur David Olson // SPDX-License-Identifier: BSD-2-Clause @@ -466,8 +469,8 @@ CalendarTimeInternal* timesub(const time_t* timep, s64 offset, const Rule* sp, int signed_y = static_cast<s32>(y); tmp->tm_year = signed_y - TM_YEAR_BASE; } - else if ((!std::is_signed_v<time_t> || std::numeric_limits<s32>::min() + TM_YEAR_BASE <= y) && - y - TM_YEAR_BASE <= std::numeric_limits<s32>::max()) { + else if ((!std::is_signed_v<time_t> || (std::numeric_limits<s32>::min)() + TM_YEAR_BASE <= y) && + y - TM_YEAR_BASE <= (std::numeric_limits<s32>::max)()) { tmp->tm_year = static_cast<s32>(y - TM_YEAR_BASE); } else { @@ -558,8 +561,8 @@ CalendarTimeInternal* localsub(Rule const* sp, time_t const* timep, s64 setname, else { newy += years; } - if (!(std::numeric_limits<s32>::min() <= newy && - newy <= std::numeric_limits<s32>::max())) { + if (!((std::numeric_limits<s32>::min)() <= newy && + newy <= (std::numeric_limits<s32>::max)())) { return nullptr; } result->tm_year = static_cast<s32>(newy); diff --git a/externals/tz/tz/tz.h b/externals/tz/tz/tz.h index dae4459bcb..e70092a987 100644 --- a/externals/tz/tz/tz.h +++ b/externals/tz/tz/tz.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-FileCopyrightText: 1996 Arthur David Olson // SPDX-License-Identifier: BSD-2-Clause @@ -26,10 +29,10 @@ constexpr size_t TZ_MAX_CHARS = 50; constexpr size_t MY_TZNAME_MAX = 255; constexpr size_t TZNAME_MAXIMUM = 255; constexpr size_t TZ_MAX_LEAPS = 50; -constexpr s64 TIME_T_MAX = std::numeric_limits<s64>::max(); -constexpr s64 TIME_T_MIN = std::numeric_limits<s64>::min(); +constexpr s64 TIME_T_MAX = (std::numeric_limits<s64>::max)(); +constexpr s64 TIME_T_MIN = (std::numeric_limits<s64>::min)(); constexpr size_t CHARS_EXTRA = 3; -constexpr size_t MAX_ZONE_CHARS = std::max(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC")); +constexpr size_t MAX_ZONE_CHARS = (std::max)(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC")); constexpr size_t MAX_TZNAME_CHARS = 2 * (MY_TZNAME_MAX + 1); struct ttinfo { @@ -51,7 +54,7 @@ struct Rule { std::array<s64, TZ_MAX_TIMES> ats; std::array<u8, TZ_MAX_TIMES> types; std::array<ttinfo, TZ_MAX_TYPES> ttis; - std::array<char, std::max(MAX_ZONE_CHARS, MAX_TZNAME_CHARS)> chars; + std::array<char, (std::max)(MAX_ZONE_CHARS, MAX_TZNAME_CHARS)> chars; s32 defaulttype; std::array <u8, 0x12C4> padding1; }; |
