From 830ea2b69faa81a8b0485a28fc329fd93d67ad46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 21 Sep 2018 12:37:37 +0200 Subject: Replace deprecated ustat using fstatfs This resolves FTBFS with glibc 2.28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- kscd/libwm/plat_linux.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'kscd/libwm/plat_linux.c') diff --git a/kscd/libwm/plat_linux.c b/kscd/libwm/plat_linux.c index 6ca8b578..84f2b6cd 100644 --- a/kscd/libwm/plat_linux.c +++ b/kscd/libwm/plat_linux.c @@ -58,13 +58,7 @@ typedef unsigned long long __u64; #if defined(BSD_MOUNTTEST) #include #else - /* - * this is for glibc 2.x which defines ust structure in - * ustat.h not stat.h - */ - #ifdef __GLIBC__ - #include - #endif + #include #endif @@ -604,7 +598,7 @@ gen_eject(struct wm_drive *d) { struct stat stbuf; #if !defined(BSD_MOUNTTEST) - struct ustat ust; + struct statfs sfsbuf; #else struct mntent *mnt; FILE *fp; @@ -619,7 +613,7 @@ gen_eject(struct wm_drive *d) /* Is this a mounted filesystem? */ #if !defined(BSD_MOUNTTEST) - if (ustat(stbuf.st_rdev, &ust) == 0) + if (fstatfs(d->fd, &sfsbuf) == 0) return (-3); #else /* -- cgit v1.2.1