diff options
author | Theodore Ts'o <tytso@mit.edu> | 2018-02-26 20:56:33 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-02-26 20:56:33 -0500 |
commit | 220c826f236fd45633d44927f6431d4b58667d01 (patch) | |
tree | 8577bc073eb911909db2b838283f5bc2771d67cb /util | |
parent | c19b18f84b67681da7f0b778d25830af67a888f3 (diff) | |
download | android_external_e2fsprogs-220c826f236fd45633d44927f6431d4b58667d01.tar.gz android_external_e2fsprogs-220c826f236fd45633d44927f6431d4b58667d01.tar.bz2 android_external_e2fsprogs-220c826f236fd45633d44927f6431d4b58667d01.zip |
remove AOSP's lib/config.h and update util/android_config.h
While synchronizing with the AOSP e2fsprogs tree, lib/config.h was
accidentally checked in. In the upstream repository, the official
copy of lib/config.h for Android should be stored in
util/android_config.h, since lib/config.h will confuse Unix builds.
This means that when synchronizing with the AOSP tree, changes
lib/config.h need to be reflected in util/android_config.h
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'util')
-rw-r--r-- | util/android_config.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/util/android_config.h b/util/android_config.h index e6b25fa5..5655c3ba 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -13,7 +13,14 @@ #define HAVE_GETPWUID_R 1 #define HAVE_INTPTR_T 1 #define HAVE_INTTYPES_H 1 +#ifdef __linux__ +#define HAVE_LSEEK64 1 +#define HAVE_LSEEK64_PROTOTYPE 1 +#endif #define HAVE_MMAP 1 +#ifdef __linux__ +#define HAVE_MNTENT_H 1 +#endif #define HAVE_SETJMP_H 1 #ifdef __linux__ #define HAVE_SETMNTENT 1 |