From 434413ccde34a56dd29996786dabbd02f70aa4c8 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Wed, 8 Jun 2016 14:26:38 -0400 Subject: [PATCH] libblkid: avoid DIOCGDINFO where missing. FreeBSD 11 will remove the DIOCGINFO ioctl(), so check if it is defined before referencing it. Signed-off-by: Matthias Andree Signed-off-by: Theodore Ts'o --- lib/blkid/getsize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c index 50293b8..8e8eb4c 100644 --- a/lib/blkid/getsize.c +++ b/lib/blkid/getsize.c @@ -131,7 +131,7 @@ blkid_loff_t blkid_get_dev_size(int fd) return (blkid_loff_t)this_floppy.size << 9; } #endif -#ifdef HAVE_SYS_DISKLABEL_H +#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) { int part = -1; struct disklabel lab; @@ -158,7 +158,7 @@ blkid_loff_t blkid_get_dev_size(int fd) return pp->p_size << 9; } } -#endif /* HAVE_SYS_DISKLABEL_H */ +#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */ { #if defined(HAVE_FSTAT64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED) struct stat64 st; -- 1.8.3.1