From 1fdee25d119c570ef68bd75b6a21806eb057f751 Mon Sep 17 00:00:00 2001 From: John Senneker Date: Tue, 17 Mar 2020 14:11:25 -0400 Subject: [PATCH 1/2] Sharpened check for 64-bit Unix when defining fseek/ftell macros. This fixes the issues with VxWorks, as mentioned by @razr in #786. --- tinyxml2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index d803b14..a9c6d11 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -106,7 +106,7 @@ distribution. #elif defined(__APPLE__) #define TIXML_FSEEK fseeko #define TIXML_FTELL ftello -#elif defined(__x86_64__) +#elif defined(__unix__) && defined(__x86_64__) #define TIXML_FSEEK fseeko64 #define TIXML_FTELL ftello64 #else From 63fb154ad3893d53ccf527acaa4b2ae5f6eb65fa Mon Sep 17 00:00:00 2001 From: a-lunkov Date: Tue, 24 Mar 2020 14:30:52 +0300 Subject: [PATCH 2/2] Update tinyxml2.cpp --- tinyxml2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index d803b14..0ad5d07 100755 --- 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__) +#elif defined(__APPLE__) || (__FreeBSD__) #define TIXML_FSEEK fseeko #define TIXML_FTELL ftello #elif defined(__x86_64__)