From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 17 Jan 2011 21:00:35 +0000 (+0100)
Subject: make _IO macros available on Solaris
X-Git-Tag: v2.19-rc2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3edaa2019bb15a3c2622e8bf910276965a5e60cd;p=thirdparty%2Futil-linux.git

make _IO macros available on Solaris

The _IO macro is defined in sys/ioccom.h on various platforms.  However,
on Solaris it isn't included by ioctl.h, so include it explicitly if
available.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---

diff --git a/configure.ac b/configure.ac
index c38cca43f9..08c5d11c7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ AC_CHECK_HEADERS(
 	sys/disk.h \
 	sys/disklabel.h \
 	sys/ioctl.h \
+	sys/ioccom.h \
 	sys/io.h \
 	sys/time.h \
 	sys/mkdev.h \
diff --git a/include/blkdev.h b/include/blkdev.h
index 86fffcff63..b6c46edde3 100644
--- a/include/blkdev.h
+++ b/include/blkdev.h
@@ -3,6 +3,9 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCCOM_H
+# include <sys/ioccom.h> /* for _IO macro on e.g. Solaris */
+#endif
 #include <fcntl.h>
 #include <unistd.h>