Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/minix.h

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/minix.h (modified) (1 diff)

branches/3.3/mindi-busybox/util-linux/minix.h

@@ -62 +62 @@
     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 */