diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-02-03 19:09:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-03 19:09:30 +0000 |
| commit | 3e11664e661e7b18ba8e89910657e434cb4f9e7b (patch) | |
| tree | 92bf4d5791f90a38f7959f1e461c2012531f6c49 | |
| parent | 2e0c074495204db4c4c2b13c41a8cd50868b6a69 (diff) | |
| parent | de7e6ec54f7847c4a7c4d84f3bc5674f4a0f3704 (diff) | |
| download | e2fsprogs-3e11664e661e7b18ba8e89910657e434cb4f9e7b.tar.gz | |
Merge changes Iadec9904,I3131563f am: 0ebe3fca69 am: de7e6ec54f
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2420182
Change-Id: I63f7cc68123dfecb3766113d9ef7d961d524fc2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | lib/config.h | 3 | ||||
| -rw-r--r-- | lib/ext2fs/ext2_err.c | 2 | ||||
| -rw-r--r-- | util/android_config.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/lib/config.h b/lib/config.h index 90b8f8a8..c2288602 100644 --- a/lib/config.h +++ b/lib/config.h @@ -54,6 +54,9 @@ # define HAVE_SYS_SELECT_H 1 # define HAVE_SYS_WAIT_H 1 #endif +#ifdef __APPLE__ +# define HAVE_GETMNTINFO 1 +#endif #if defined(__linux__) # define HAVE_EXT2_IOCTLS 1 # define HAVE_FALLOCATE 1 diff --git a/lib/ext2fs/ext2_err.c b/lib/ext2fs/ext2_err.c index b03640f1..ebfd5006 100644 --- a/lib/ext2fs/ext2_err.c +++ b/lib/ext2fs/ext2_err.c @@ -8,7 +8,7 @@ #define N_(a) a static const char * const text[] = { - N_( "EXT2FS Library version android-t-qpr1-beta-2-gpl-317-gf5bb4815"), + N_( "EXT2FS Library version android-t-qpr1-beta-2-gpl-322-gbb6d46cc"), N_( "Wrong magic number for ext2_filsys structure"), N_( "Wrong magic number for badblocks_list structure"), N_( "Wrong magic number for badblocks_iterate structure"), diff --git a/util/android_config.h b/util/android_config.h index 90b8f8a8..c2288602 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -54,6 +54,9 @@ # define HAVE_SYS_SELECT_H 1 # define HAVE_SYS_WAIT_H 1 #endif +#ifdef __APPLE__ +# define HAVE_GETMNTINFO 1 +#endif #if defined(__linux__) # define HAVE_EXT2_IOCTLS 1 # define HAVE_FALLOCATE 1 |