From: Matthias Andree <matthias.andree@gmx.de>
Date: Wed, 8 Jun 2016 18:26:38 +0000 (-0400)
Subject: libblkid: avoid DIOCGDINFO where missing.
X-Git-Tag: v1.43.1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=434413ccde34a56dd29996786dabbd02f70aa4c8;p=thirdparty%2Fe2fsprogs.git

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 <matthias.andree@gmx.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index 50293b828..8e8eb4c45 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;