2018-03-22 03:56:30 +00:00
|
|
|
diff --git a/contrib/android/perms.c b/contrib/android/perms.c
|
2019-08-05 02:25:49 +00:00
|
|
|
index 9c5ec05b..865cc907 100644
|
2018-03-22 03:56:30 +00:00
|
|
|
--- a/contrib/android/perms.c
|
|
|
|
|
+++ b/contrib/android/perms.c
|
|
|
|
|
@@ -5,6 +5,7 @@
|
|
|
|
|
#include "support/nls-enable.h"
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
+#include "private/android_filesystem_capability.h"
|
|
|
|
|
|
|
|
|
|
#ifndef XATTR_SELINUX_SUFFIX
|
|
|
|
|
# define XATTR_SELINUX_SUFFIX "selinux"
|
|
|
|
|
diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
|
|
|
|
|
index 505b3c9c..7be5105f 100644
|
|
|
|
|
--- a/lib/ext2fs/bitops.h
|
|
|
|
|
+++ b/lib/ext2fs/bitops.h
|
|
|
|
|
@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_generic_bmap(ext2fs_generic_bitmap bitmap
|
|
|
|
|
#if (__STDC_VERSION__ >= 199901L)
|
|
|
|
|
#define _INLINE_ extern inline
|
|
|
|
|
#else
|
|
|
|
|
-#define _INLINE_ inline
|
|
|
|
|
+#define _INLINE_ static inline
|
|
|
|
|
#endif
|
|
|
|
|
#else /* !INCLUDE_INLINE FUNCS */
|
|
|
|
|
#if (__STDC_VERSION__ >= 199901L)
|
|
|
|
|
-#define _INLINE_ inline
|
|
|
|
|
+#define _INLINE_ static inline
|
|
|
|
|
#else /* not C99 */
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
|
#define _INLINE_ extern __inline__
|
|
|
|
|
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
|
2019-08-05 02:25:49 +00:00
|
|
|
index 185be5df..833d9d87 100644
|
2018-03-22 03:56:30 +00:00
|
|
|
--- a/lib/ext2fs/ext2fs.h
|
|
|
|
|
+++ b/lib/ext2fs/ext2fs.h
|
2019-08-05 02:25:49 +00:00
|
|
|
@@ -1767,7 +1767,7 @@ extern const struct ext2_inode *ext2fs_const_inode(const struct ext2_inode_large
|
2018-03-22 03:56:30 +00:00
|
|
|
#define _INLINE_ extern
|
|
|
|
|
#else
|
|
|
|
|
#if (__STDC_VERSION__ >= 199901L)
|
|
|
|
|
-#define _INLINE_ inline
|
|
|
|
|
+#define _INLINE_ static inline
|
|
|
|
|
#else
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
|
#define _INLINE_ extern __inline__
|
