From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 11 Aug 2016 12:56:08 +0000 (+0200)
Subject: blkdev: guard against missing DIOCGDINFO on FreeBSD 11
X-Git-Tag: v2.29-rc1~121^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6978b2c43096e2d4d7938c359d37ff143505aa13;p=thirdparty%2Futil-linux.git

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.
---

diff --git a/lib/blkdev.c b/lib/blkdev.c
index fa42b86bef..077d92697f 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;