diff options
author | Colin Cross <ccross@android.com> | 2021-08-25 00:16:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-25 00:16:47 +0000 |
commit | 51fa8db804c75b65c9a83218abd8766ae56e1202 (patch) | |
tree | e7136c9a7e008fb6d162c694c79e86c967b37c15 | |
parent | 305278a272828784780363c9b8d906000af563bc (diff) | |
parent | a1bf8e0e4a4164267cf3819b4e8a3452ecc6430b (diff) | |
download | e2fsprogs-51fa8db804c75b65c9a83218abd8766ae56e1202.tar.gz |
Merge "Fix e2fsdroid build with musl" am: a8c312b513 am: e3816d833d am: a1bf8e0e4aandroid-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1797236
Change-Id: I2824c67754e90779e2de7d4dc4439081530c1d44
-rw-r--r-- | contrib/android/e2fsdroid.c | 2 | ||||
-rw-r--r-- | contrib/android/perms.c | 1 | ||||
-rw-r--r-- | contrib/android/perms.h | 1 | ||||
-rw-r--r-- | e2fsck/jfs_user.h | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c index f5d24b88..6e514140 100644 --- a/contrib/android/e2fsdroid.c +++ b/contrib/android/e2fsdroid.c @@ -1,11 +1,11 @@ #define _GNU_SOURCE +#include "config.h" #include <stdio.h> #include <getopt.h> #include <string.h> #include <unistd.h> #include <limits.h> -#include <ext2fs/ext2fs.h> #include "perms.h" #include "base_fs.h" diff --git a/contrib/android/perms.c b/contrib/android/perms.c index 9c5ec05b..dd05644e 100644 --- a/contrib/android/perms.c +++ b/contrib/android/perms.c @@ -1,6 +1,7 @@ #ifndef _GNU_SOURCE # define _GNU_SOURCE //asprintf #endif +#include "config.h" #include "perms.h" #include "support/nls-enable.h" #include <time.h> diff --git a/contrib/android/perms.h b/contrib/android/perms.h index 79871272..9ea3f95c 100644 --- a/contrib/android/perms.h +++ b/contrib/android/perms.h @@ -1,7 +1,6 @@ #ifndef ANDROID_PERMS_H # define ANDROID_PERMS_H -# include "config.h" # include <ext2fs/ext2fs.h> typedef void (*fs_config_f)(const char *path, int dir, diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index 6d24558b..3b91765c 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -11,6 +11,8 @@ #ifndef _JFS_USER_H #define _JFS_USER_H +#include "config.h" + #ifdef DEBUGFS #include <stdio.h> #include <stdlib.h> @@ -27,7 +29,6 @@ /* * Pull in the definition of the e2fsck context structure */ -#include "config.h" #include "e2fsck.h" #endif |