more bionic fixes

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

diff --git a/miscutils/eject.c b/miscutils/eject.c
index 15eaf556d68bd7c7ba3aca164f0856215d9aeb38..e33d7912776239a7eae5dd3b55eb8940e2d0de47 100644 (file)
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -73,7 +73,7 @@ static void eject_scsi(const char *dev)
        ioctl(dev_fd, BLKRRPART);
 }
 #else
-# define eject_scsi() ((void)0)
+# define eject_scsi(dev) ((void)0)
 #endif
 
 /* various defines swiped from linux/cdrom.h */

diff --git a/util-linux/minix.h b/util-linux/minix.h
index e0fbcf7612f4b878507b2c8a042572ea3f97aca9..83ffe6da57b03ed281043205c373c3b0699e3a06 100644 (file)
--- 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 */