1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00

Merge pull request #21140 from ConiKost/musl

* src/openrct2/core/FileStream.cpp: drop ftello64, fseeko64

The static usage definition of ftello64 and friends is not correct.
While this currently works on glibc, this breaks on musl, as musl
already is LFS aware. The solution is to drop this and add instead
'-D_FILE_OFFSET_BITS=64' to the build system.

Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

* CMakeLists.txt: add D_FILE_OFFSET_BITS=64

Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
This commit is contained in:
Michał Janiszewski
2024-01-04 22:03:44 +01:00
committed by GitHub
2 changed files with 4 additions and 5 deletions

View File

@@ -265,3 +265,7 @@ else ()
# Dummy target to ease invocation
add_custom_target(${PROJECT_NAME}-headers-check)
endif ()
if (UNIX)
add_definitions(-D_FILE_OFFSET_BITS=64)
endif ()

View File

@@ -21,11 +21,6 @@
# include <io.h>
#endif
#if defined(__linux__) && !defined(__ANDROID__)
# define ftello ftello64
# define fseeko fseeko64
#endif
#ifdef _MSC_VER
# define ftello _ftelli64
# define fseeko _fseeki64