Merge "Add definition of off64_t for mac os builds" am: 3e0b594619

am: 0b60b181c4

Change-Id: If6e297d32275dd20c9f3ec0f7da45c3715154c54

base/include/android-base/file.h

@@ -18,12 +18,18 @@
 #define ANDROID_BASE_FILE_H
 
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <string>
 
 #if !defined(_WIN32) && !defined(O_BINARY)
 #define O_BINARY 0
 #endif
 
+#if defined(__APPLE__)
+/* Mac OS has always had a 64-bit off_t, so it doesn't have off64_t. */
+typedef off_t off64_t;
+#endif
+
 namespace android {
 namespace base {