summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko2016-03-14 19:34:15 +0100
committerDenys Vlasenko2016-03-14 19:34:15 +0100
commit23961b2fd39d1c8e8d623c15fc12dc7b1b91a1be (patch)
tree1445b2701688aec2cdfecb76c913e80adbfb7b4e /util-linux
parentdbb58a3879c2daa3e286a8cd9da7935e264f3072 (diff)
downloadbusybox-23961b2fd39d1c8e8d623c15fc12dc7b1b91a1be.zip
busybox-23961b2fd39d1c8e8d623c15fc12dc7b1b91a1be.tar.gz
more bionic fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/minix.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/util-linux/minix.h b/util-linux/minix.h
index e0fbcf7..83ffe6d 100644
--- a/util-linux/minix.h
+++ b/util-linux/minix.h
@@ -61,9 +61,14 @@ enum {
MINIX_ROOT_INO = 1,
MINIX_BAD_INO = 2,
+#undef MINIX1_SUPER_MAGIC
MINIX1_SUPER_MAGIC = 0x137F, /* original minix fs */
+#undef MINIX1_SUPER_MAGIC2
MINIX1_SUPER_MAGIC2 = 0x138F, /* minix fs, 30 char names */
+/* bionic has this define */
+#undef MINIX2_SUPER_MAGIC
MINIX2_SUPER_MAGIC = 0x2468, /* minix V2 fs */
+#undef MINIX2_SUPER_MAGIC2
MINIX2_SUPER_MAGIC2 = 0x2478, /* minix V2 fs, 30 char names */
MINIX_VALID_FS = 0x0001, /* clean fs */
MINIX_ERROR_FS = 0x0002, /* fs has errors */