aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--miscutils/eject.c2
-rw-r--r--util-linux/minix.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 15eaf556d..e33d79127 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -73,7 +73,7 @@ static void eject_scsi(const char *dev)
73 ioctl(dev_fd, BLKRRPART); 73 ioctl(dev_fd, BLKRRPART);
74} 74}
75#else 75#else
76# define eject_scsi() ((void)0) 76# define eject_scsi(dev) ((void)0)
77#endif 77#endif
78 78
79/* various defines swiped from linux/cdrom.h */ 79/* various defines swiped from linux/cdrom.h */
diff --git a/util-linux/minix.h b/util-linux/minix.h
index e0fbcf761..83ffe6da5 100644
--- a/util-linux/minix.h
+++ b/util-linux/minix.h
@@ -61,9 +61,14 @@ enum {
61 MINIX_ROOT_INO = 1, 61 MINIX_ROOT_INO = 1,
62 MINIX_BAD_INO = 2, 62 MINIX_BAD_INO = 2,
63 63
64#undef MINIX1_SUPER_MAGIC
64 MINIX1_SUPER_MAGIC = 0x137F, /* original minix fs */ 65 MINIX1_SUPER_MAGIC = 0x137F, /* original minix fs */
66#undef MINIX1_SUPER_MAGIC2
65 MINIX1_SUPER_MAGIC2 = 0x138F, /* minix fs, 30 char names */ 67 MINIX1_SUPER_MAGIC2 = 0x138F, /* minix fs, 30 char names */
68/* bionic has this define */
69#undef MINIX2_SUPER_MAGIC
66 MINIX2_SUPER_MAGIC = 0x2468, /* minix V2 fs */ 70 MINIX2_SUPER_MAGIC = 0x2468, /* minix V2 fs */
71#undef MINIX2_SUPER_MAGIC2
67 MINIX2_SUPER_MAGIC2 = 0x2478, /* minix V2 fs, 30 char names */ 72 MINIX2_SUPER_MAGIC2 = 0x2478, /* minix V2 fs, 30 char names */
68 MINIX_VALID_FS = 0x0001, /* clean fs */ 73 MINIX_VALID_FS = 0x0001, /* clean fs */
69 MINIX_ERROR_FS = 0x0002, /* fs has errors */ 74 MINIX_ERROR_FS = 0x0002, /* fs has errors */