Snap for 7673994 from a6f2586 to tm-release

Change-Id: I90b26586b60e006a57c0116f74f7b8b58223847e
SpiceOS-Beta · Aug 26, 2021 · f592d19 · f592d19
2 parents 027b347 + a6f2586
commit f592d19
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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