Fix building issues on Android 5.0

diff --git a/libexfat/exfat.h b/libexfat/exfat.h
index 7a6f57a..fdd7136 100644 (file)
--- a/libexfat/exfat.h
+++ b/libexfat/exfat.h
@@ -24,11 +24,6 @@
 #ifndef EXFAT_H_INCLUDED
 #define EXFAT_H_INCLUDED
 
-#if defined(__ANDROID__)
-#define _OFF_T_DEFINED_
-typedef long long off_t;
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -39,6 +34,11 @@ typedef long long off_t;
 #include "exfatfs.h"
 #include "version.h"
 
+#ifdef __ANDROID__
+#undef off_t
+#define off_t off64_t
+#endif
+
 #define EXFAT_NAME_MAX 256
 #define EXFAT_ATTRIB_CONTIGUOUS 0x10000
 #define EXFAT_ATTRIB_CACHED     0x20000