emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more bionic fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-03-14 19:34:15 +01:00
parent dbb58a3879
commit 23961b2fd3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miscutils/eject.c
View File

@ -73,7 +73,7 @@ static void eject_scsi(const char *dev)
ioctl(dev_fd, BLKRRPART); ioctl(dev_fd, BLKRRPART);
} }
#else #else
# define eject_scsi() ((void)0) # define eject_scsi(dev) ((void)0)
#endif #endif
/* various defines swiped from linux/cdrom.h */ /* various defines swiped from linux/cdrom.h */

5
util-linux/minix.h
View File

@ -61,9 +61,14 @@ enum {
MINIX_ROOT_INO = 1, MINIX_ROOT_INO = 1,
MINIX_BAD_INO = 2, MINIX_BAD_INO = 2,
#undef MINIX1_SUPER_MAGIC
MINIX1_SUPER_MAGIC = 0x137F, /* original minix fs */ MINIX1_SUPER_MAGIC = 0x137F, /* original minix fs */
#undef MINIX1_SUPER_MAGIC2
MINIX1_SUPER_MAGIC2 = 0x138F, /* minix fs, 30 char names */ MINIX1_SUPER_MAGIC2 = 0x138F, /* minix fs, 30 char names */
/* bionic has this define */
#undef MINIX2_SUPER_MAGIC
MINIX2_SUPER_MAGIC = 0x2468, /* minix V2 fs */ MINIX2_SUPER_MAGIC = 0x2468, /* minix V2 fs */
#undef MINIX2_SUPER_MAGIC2
MINIX2_SUPER_MAGIC2 = 0x2478, /* minix V2 fs, 30 char names */ MINIX2_SUPER_MAGIC2 = 0x2478, /* minix V2 fs, 30 char names */
MINIX_VALID_FS = 0x0001, /* clean fs */ MINIX_VALID_FS = 0x0001, /* clean fs */
MINIX_ERROR_FS = 0x0002, /* fs has errors */ MINIX_ERROR_FS = 0x0002, /* fs has errors */