diff options
| author | Violet Purcell <vimproved@inventati.org> | 2023-06-08 14:57:30 +0000 |
|---|---|---|
| committer | Violet Purcell <vimproved@inventati.org> | 2023-06-09 01:43:27 +0000 |
| commit | f439598036842212b7a886095ff1c85e9a3cbf22 (patch) | |
| tree | e15969975af7d8cb20579e14b1ab7563b1c30de5 | |
| parent | e05956094c27117f989d22f25b75633123d72a83 (diff) | |
| download | tinyxml2-f439598036842212b7a886095ff1c85e9a3cbf22.tar.gz | |
Remove LFS64 calls and set _FILE_OFFSET_BITS=64
Musl 1.2.4 made the LFS64 interfaces only available when
_LARGEFILE64_SOURCE is defined, and they will be removed altogether in
Musl 1.2.5. This commit replaces the LFS64 calls with their non-LFS64
versions and defines _FILE_OFFSET_BITS=64, which makes all interfaces
64-bit.
Bug: https://bugs.gentoo.org/905999
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | tinyxml2.cpp | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8802fb8..2a45e45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ target_compile_definitions( PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
+ PUBLIC _FILE_OFFSET_BITS=64
)
set_target_properties(
@@ -10,7 +10,7 @@ ARFLAGS = cr RM = rm -f RANLIB = ranlib MKDIR = mkdir -p -CXXFLAGS = -fPIC +CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC INSTALL = install INSTALL_PROGRAM = $(INSTALL) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index 4b561b3..e361818 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -114,9 +114,6 @@ distribution. #define TIXML_FSEEK fseeko
#define TIXML_FTELL ftello
#endif
-#elif defined(__unix__) && defined(__x86_64__)
- #define TIXML_FSEEK fseeko64
- #define TIXML_FTELL ftello64
#else
#define TIXML_FSEEK fseek
#define TIXML_FTELL ftell
|