f2fs-tools: move android_config before defining them
PATCH 1/1 f2fs-tools: move android_config before defining them
Signed-off-by Jaegeuk Kim <[email protected]>
--- fsck/f2fs.h | 4 ++-- fsck/xattr.h | 2 ++ mkfs/f2fs_format.c | 6 ++++-- tools/f2fscrypt.c | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-)
fsck/f2fs.h +2 -2
@@ -20,6 +20,8 @@#include <fcntl.h> #include <string.h> #include <errno.h> +#include <f2fs_fs.h> +#ifdef HAVE_MNTENT_H #include <mntent.h> #endif
@@ -35,8 +37,6 @@#endif #include <assert.h> -#include "f2fs_fs.h" -#define EXIT_ERR_CODE (-1)#define ver_after (a, b) (typecheck(unsigned long long, a) && \ typecheck(unsigned long long, b) && \
fsck/xattr.h +2 -0
@@ -35,7 +35,9 @@ struct f2fs_xattr_entry { };#define FS_ENCRYPTION_CONTEXT_FORMAT_V1 1 +#ifndef FS_KEY_DESCRIPTOR_SIZE #define FS_KEY_DESCRIPTOR_SIZE 8 +#endif #define FS_KEY_DERIVATION_NONCE_SIZE 16struct fscrypt_context {
mkfs/f2fs_format.c +4 -2
@@ -8,11 +8,15 @@*/ #define _LARGEFILE64_SOURCE +#include "config.h" +#include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <string.h> #include <unistd.h> +#include <f2fs_fs.h> +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif
@@ -21,7 +25,6 @@#endif #include <time.h> -#include "config.h" #ifdef HAVE_UUID_UUID_H #include <uuid/uuid.h> #endif
@@ -30,7 +33,6 @@#define uuid_generate (a)#endif -#include "f2fs_fs.h" #include "quota.h" #include "f2fs_format_utils.h"
tools/f2fscrypt.c +2 -2
@@ -21,6 +21,8 @@#endif #include "config.h" +#include <f2fs_fs.h> +#include <assert.h> #include <errno.h> #include <getopt.h>
@@ -44,8 +46,6 @@#include <linux/fs.h> #endif -#include <f2fs_fs.h> -#ifdef HAVE_UUID_UUID_H #include <uuid/uuid.h> #else
Signature · 8 lines
2.36.1.124.g0e6072fb45-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel