Merge "Fix e2fsdroid build with musl" am: a8c312b513 am: e3816d833d am: a1bf8e0e4a am: 51fa8db804 am: 3b463c3207
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1797236
Change-Id: Icc3c9466f9543bfe8f12bbb36859bd0502fc7d02
diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c
index f5d24b8..6e51414 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 9c5ec05..dd05644 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 7987127..9ea3f95 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 6d24558..3b91765 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
