Commit 128543721 (Fixes for FreeBSD build) broke build of mount and umount for Linux as follows:
util-linux/lib.a(mount.o): In function `mount_main': mount.c:(.text.mount_main+0x418): undefined reference to `match_fstype' util-linux/lib.a(umount.o): In function `umount_main': umount.c:(.text.umount_main+0xf4): undefined reference to `match_fstype' Fix this by moving '#ifdef HAVE_MNTENT_H' after '#include "libbb.h"'. Signed-off-by: Baruch Siach <[email protected]> --- libbb/match_fstype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c index c792d13..32c3d7f 100644 --- a/libbb/match_fstype.c +++ b/libbb/match_fstype.c @@ -10,10 +10,10 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#ifdef HAVE_MNTENT_H - #include "libbb.h" +#ifdef HAVE_MNTENT_H + int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) { int match = 1; -- 1.7.5.4 _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
