Pārlūkot izejas kodu

Merge pull request #973 from davidoakley/fix-android-before-api24

Use fseek/ftell on Android when api level < 24
Lee Thomason 1 gadu atpakaļ
vecāks
revīzija
0f9c021a44
1 mainītis faili ar 3 papildinājumiem un 8 dzēšanām
  1. 3 8
      tinyxml2.cpp

+ 3 - 8
tinyxml2.cpp

@@ -106,14 +106,9 @@ distribution.
 #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
 #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
 	#define TIXML_FSEEK fseeko
 	#define TIXML_FSEEK fseeko
 	#define TIXML_FTELL ftello
 	#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
 #else
 	#define TIXML_FSEEK fseek
 	#define TIXML_FSEEK fseek
 	#define TIXML_FTELL ftell
 	#define TIXML_FTELL ftell