5 Commits

Author SHA1 Message Date
Lee Thomason
2d59aaf0da Merge branch 'master' of https://github.com/vimproved/tinyxml2 into vimproved-master 2023-11-21 12:16:06 -08:00
Lee Thomason
e0302bfd44 merged 2023-11-21 12:15:37 -08:00
Lee Thomason
bfc4ac4f58 Merge pull request #960 from leethomason/kcsaul-pedantic-whitespace
Integrate branch with Pedantic whitespace
2023-11-21 12:12:41 -08:00
Lee Thomason
8158ba05ac fix readme link 2023-11-21 11:40:28 -08:00
Violet Purcell
f439598036 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
2023-06-09 01:43:27 +00:00
3 changed files with 2 additions and 4 deletions

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(

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)

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