23961b2fd
Denys Vlasenko
2016-03-14
Subject
more bionic fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/eject.c+1 -1
| @@ -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 */ | |
util-linux/minix.h+5 -0
| @@ -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 */ | |