ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."

Browse source 
* commit 'd559d6c72a411d14c7a964dad1eb7f6e229314cb':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
This commit is contained in:
Elliott Hughes 2014-09-23 15:59:01 +00:00 • committed by Android Git Automerger
commit fbb4188cfa
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/utils/Compat.h
View file

@ -19,11 +19,9 @@
#include <unistd.h>
/* Compatibility definitions for non-Linux (i.e., BSD-based) hosts. */
#ifndef HAVE_OFF64_T
#if _FILE_OFFSET_BITS < 64
#error "_FILE_OFFSET_BITS < 64; large files are not supported on this platform"
#endif /* _FILE_OFFSET_BITS < 64 */
#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;
@ -31,13 +29,11 @@ static inline off64_t lseek64(int fd, off64_t offset, int whence) {
return lseek(fd, offset, whence);
}
#ifdef HAVE_PREAD
static inline ssize_t pread64(int fd, void* buf, size_t nbytes, off64_t offset) {
return pread(fd, buf, nbytes, offset);
}
#endif
#endif /* !HAVE_OFF64_T */
#endif /* __APPLE__ */
#if HAVE_PRINTF_ZD
# define ZD "%zd"