From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 12 Apr 2012 12:01:10 +0000 (+0200)
Subject: work around linux/ext2_fs.h breakage
X-Git-Tag: 1_20_0~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=caf5768154301697430f0a3718838967d0f55f95;p=oweals%2Fbusybox.git

work around linux/ext2_fs.h breakage

See https://bugzilla.kernel.org/show_bug.cgi?id=42986

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 020bdaa33..8da7432d9 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -8,6 +8,12 @@
  */
 #include "libbb.h"
 #include <linux/fs.h>
+/*
+ * Work around linux/ext2_fs.h breakage.
+ * See https://bugzilla.kernel.org/show_bug.cgi?id=42986.
+ */
+typedef mode_t bb__umode_t;
+#define umode_t bb__umode_t
 #include <linux/ext2_fs.h>
 
 // storage helpers
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 6cbbe0e07..759bb0a7a 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -48,6 +48,12 @@
 
 #include "libbb.h"
 #include <linux/fs.h>
+/*
+ * Work around linux/ext2_fs.h breakage.
+ * See https://bugzilla.kernel.org/show_bug.cgi?id=42986.
+ */
+typedef mode_t bb__umode_t;
+#define umode_t bb__umode_t
 #include <linux/ext2_fs.h>
 
 #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0