potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Remove LFS64 calls and set _FILE_OFFSET_BITS=64

Browse Source 
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
This commit is contained in:
Violet Purcell
2023-06-08 14:57:30 +00:00
parent e05956094c
commit f439598036
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -31,6 +31,7 @@ target_compile_definitions(
PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG> PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT> INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS> PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
PUBLIC _FILE_OFFSET_BITS=64
) )
set_target_properties( set_target_properties(

2
Makefile
View File

@@ -10,7 +10,7 @@ ARFLAGS = cr
RM = rm -f RM = rm -f
RANLIB = ranlib RANLIB = ranlib
MKDIR = mkdir -p MKDIR = mkdir -p
CXXFLAGS = -fPIC CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC
INSTALL = install INSTALL = install
INSTALL_PROGRAM = $(INSTALL) INSTALL_PROGRAM = $(INSTALL)

3
tinyxml2.cpp
View File

@@ -114,9 +114,6 @@ distribution.
#define TIXML_FSEEK fseeko #define TIXML_FSEEK fseeko
#define TIXML_FTELL ftello #define TIXML_FTELL ftello
#endif #endif
#elif defined(__unix__) && defined(__x86_64__)
#define TIXML_FSEEK fseeko64
#define TIXML_FTELL ftello64
#else #else
#define TIXML_FSEEK fseek #define TIXML_FSEEK fseek
#define TIXML_FTELL ftell #define TIXML_FTELL ftell