From 6978b2c43096e2d4d7938c359d37ff143505aa13 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 11 Aug 2016 14:56:08 +0200 Subject: blkdev: guard against missing DIOCGDINFO on FreeBSD 11 DIOCGMEDIASIZE is supported and available since FreeBSD 5, it may make sense to kill the backwards-glue completely instead. --- lib/blkdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/blkdev.c') diff --git a/lib/blkdev.c b/lib/blkdev.c index fa42b86be..077d92697 100644 --- a/lib/blkdev.c +++ b/lib/blkdev.c @@ -133,7 +133,7 @@ blkdev_get_size(int fd, unsigned long long *bytes) } #endif /* FDGETPRM */ -#ifdef HAVE_SYS_DISKLABEL_H +#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) { /* * This code works for FreeBSD 4.11 i386, except for the full device @@ -161,7 +161,7 @@ blkdev_get_size(int fd, unsigned long long *bytes) } } } -#endif /* HAVE_SYS_DISKLABEL_H */ +#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */ { struct stat st; -- cgit v1.2.3-55-g7522