From dfc20c5f8f07451b25ab652847fa4d3525e90749 Mon Sep 17 00:00:00 2001 From: David Oakley Date: Mon, 8 Apr 2024 12:58:12 +0100 Subject: [PATCH] =?UTF-8?q?Android=20SDK<24=20doesn=E2=80=99t=20support=20?= =?UTF-8?q?fseeko/ftello?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fall back to using fseek/ftell; This was broken by https://github.com/leethomason/tinyxml2/pull/903/commits/d9fb8d34439be452c18b63713e2e0ae0e6028072 --- tinyxml2.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index c5c48701..a96caf04 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -106,14 +106,9 @@ distribution. #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__) #define TIXML_FSEEK fseeko #define TIXML_FTELL ftello -#elif 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(__ANDROID__) && __ANDROID_API__ > 24 + #define TIXML_FSEEK fseeko64 + #define TIXML_FTELL ftello64 #else #define TIXML_FSEEK fseek #define TIXML_FTELL ftell