diff options
| author | Colin Cross <ccross@android.com> | 2021-08-24 23:21:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-24 23:21:42 +0000 |
| commit | a8c312b5133cf7ed9e617da14a1b472111321f65 (patch) | |
| tree | e7136c9a7e008fb6d162c694c79e86c967b37c15 /contrib | |
| parent | 24701ed269ee62aecdf865c7a0583e423a62d754 (diff) | |
| parent | 09c63d5edd35e3ca8366be0d92aad922d8895ac1 (diff) | |
| download | platform_external_e2fsprogs-master.tar.gz platform_external_e2fsprogs-master.tar.bz2 platform_external_e2fsprogs-master.zip | |
Merge "Fix e2fsdroid build with musl"HEADandroid-s-beta-5masterandroid-s-beta-5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/android/e2fsdroid.c | 2 | ||||
| -rw-r--r-- | contrib/android/perms.c | 1 | ||||
| -rw-r--r-- | contrib/android/perms.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c index f5d24b885..6e5141409 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 9c5ec05bc..dd05644eb 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 798712720..9ea3f95c0 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, |