diff options
| author | Colin Cross <ccross@android.com> | 2016-10-21 16:41:10 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-23 21:27:57 -0400 |
| commit | 25072b2381c1be08bb852ee85c7d5ffbbe4e017b (patch) | |
| tree | b394cabd029e6e717908630eac7c6c953f90e2f3 /util/android_config.h | |
| parent | ac1e303c51571514428462a64274addbab95055a (diff) | |
| download | e2fsprogs-25072b2381c1be08bb852ee85c7d5ffbbe4e017b.tar.gz | |
AOSP: Fix mac build
Disable linux-only features in config.h
Fix one use of ino_t instead of ext2_ino_t.
Test: mma -j
Test: e2fsck -f -n $OUT/system.img
Bug: 27599744
Change-Id: I3291ae888ac28a49813365ab2431a3c266de9907
From AOSP commit: bfa685deba9eb828b7ed35d6ccaf0345f6337ce3
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'util/android_config.h')
| -rw-r--r-- | util/android_config.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/util/android_config.h b/util/android_config.h index b3c12a7d..b3fd3042 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -16,17 +16,23 @@ #define HAVE_GETPWUID_R 1 #define HAVE_INTPTR_T 1 #define HAVE_INTTYPES_H 1 +#ifdef __linux__ #define HAVE_LINUX_FD_H 1 #define HAVE_LSEEK64 1 #define HAVE_LSEEK64_PROTOTYPE 1 +#endif #define HAVE_MMAP 1 #define HAVE_NETINET_IN_H 1 #define HAVE_NET_IF_H 1 #define HAVE_POSIX_MEMALIGN 1 #define HAVE_PREAD 1 +#ifdef __linux__ #define HAVE_PREAD64 1 +#endif #define HAVE_PWRITE 1 +#ifdef __linux__ #define HAVE_PWRITE64 1 +#endif #define HAVE_SETJMP_H 1 #define HAVE_SNPRINTF 1 #define HAVE_STDLIB_H 1 @@ -40,7 +46,9 @@ #define HAVE_SYS_MMAN_H 1 #define HAVE_SYS_MOUNT_H 1 #define HAVE_SYS_PARAM_H 1 +#ifdef __linux__ #define HAVE_SYS_PRCTL_H 1 +#endif #define HAVE_SYS_RESOURCE_H 1 #define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_STAT_H 1 |