topjohnwu/ndk-busybox
1
0
Fork 0
mirror of https://github.com/topjohnwu/ndk-busybox.git synced 2024-11-26 21:20:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix fsck.minix, mkfs.minix: undef HAVE_SETBIT, MINIX2_SUPER_MAGIC, MINIX2_SUPER_MAGIC

Browse Source 
"there is no setbit/clrbit in bionic"
"MINIX2_SUPER_MAGIC / MINIX2_SUPER_MAGIC2 defined in sys/vfs.h, undefine
it to use it in the enum"

Patch by Tias Guns <tias@ulyssis.org>, based on 'no-setbit' and
'undefine-minix2-magic-to-use-in-enum' by Dan Drown
http://dan.drown.org/android/src/busybox/
Rebased for busybox 1.28.1 by Chris Renshaw <osm0sis@outlook.com>
This commit is contained in:
Chris Renshaw 2018-02-18 07:54:58 -04:00 committed by topjohnwu
parent 187cfa9753
commit d4d38041c2
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/platform.h
View File

@ -551,6 +551,7 @@ typedef unsigned smalluint;
# undef HAVE_UNLOCKED_LINE_OPS
# undef HAVE_NET_ETHERNET_H
# undef HAVE_PRINTF_PERCENTM
# undef HAVE_SETBIT
#endif
/*

2
util-linux/minix.h
View File

@ -54,6 +54,8 @@ struct minix_dir_entry {
/* Believe it or not, but mount.h has this one #defined */
#undef BLOCK_SIZE
#undef MINIX2_SUPER_MAGIC
#undef MINIX2_SUPER_MAGIC2
enum {
BLOCK_SIZE = 1024,
BITS_PER_BLOCK = BLOCK_SIZE << 3,