From 953018ab93c89ee181c32827edcb952c1208cbd3 Mon Sep 17 00:00:00 2001 From: Lee Thomason Date: Sat, 2 Apr 2022 14:14:20 -0700 Subject: [PATCH 1/2] fix android build --- tinyxml2.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index bb51e08a..78e80ea8 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -103,10 +103,17 @@ distribution. #if defined(_WIN64) #define TIXML_FSEEK _fseeki64 #define TIXML_FTELL _ftelli64 -#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ - || defined(__NetBSD__) || defined(__DragonFly__) || defined(__ANDROID__) || (__CYGWIN__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || (__CYGWIN__) #define TIXML_FSEEK fseeko #define TIXML_FTELL ftello +#elif defined defined(__ANDROID__) + #if __ANDROID_API__ > 24 + #define TIXML_FSEEK fseeko64 + #define TIXML_FTELL ftello64 + #else + #define TIXML_FSEEK fseeko + #define TIXML_FTELL ftello + #endif #elif defined(__unix__) && defined(__x86_64__) #define TIXML_FSEEK fseeko64 #define TIXML_FTELL ftello64 From 7e310468f3bfd991ec027e33c2876ac014984df0 Mon Sep 17 00:00:00 2001 From: Lee Thomason Date: Sat, 2 Apr 2022 14:15:59 -0700 Subject: [PATCH 2/2] typo --- tinyxml2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index 78e80ea8..a7476053 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -106,7 +106,7 @@ distribution. #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || (__CYGWIN__) #define TIXML_FSEEK fseeko #define TIXML_FTELL ftello -#elif defined defined(__ANDROID__) +#elif defined(__ANDROID__) #if __ANDROID_API__ > 24 #define TIXML_FSEEK fseeko64 #define TIXML_FTELL ftello64