Merge branch 'work/dfaure/Wundef' of https://github.com/dfaure-kdab/tinyxml2 into dfaure-kdab-work/dfaure/Wundef

Merge pull request #961 from leethomason/vimproved-master
Testing build fixes
2023-11-21 12:35:56 -08:00 · 2023-11-21 12:25:57 -08:00 · 2023-11-21 12:16:06 -08:00 · 2023-11-21 12:15:37 -08:00 · 2023-11-21 12:12:41 -08:00 · 2023-11-21 11:40:28 -08:00
3 changed files with 3 additions and 5 deletions
--- 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(
--- a/2
+++ b/2
@@ -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)
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -103,7 +103,7 @@ distribution.
 #if defined(_WIN64)
 	#define TIXML_FSEEK _fseeki64
 	#define TIXML_FTELL _ftelli64
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || (__CYGWIN__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
 	#define TIXML_FSEEK fseeko
 	#define TIXML_FTELL ftello
 #elif defined(__ANDROID__) 
@@ -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
Author	SHA1	Message	Date
Lee Thomason	6b6d1214a7	Merge branch 'work/dfaure/Wundef' of https://github.com/dfaure-kdab/tinyxml2 into dfaure-kdab-work/dfaure/Wundef	2023-11-21 12:35:56 -08:00
Lee Thomason	7c99119fd2	Merge pull request #961 from leethomason/vimproved-master Testing build fixes	2023-11-21 12:25:57 -08:00
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
David Faure	5080faafe6	Add missing "defined", to fix building with -Werror=undef	2023-09-17 21:39:55 +02: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