From 6011359cb30c51ac879732b0b74398da6b4e42e5 Mon Sep 17 00:00:00 2001
From: Zdenek Styblik <zdenek.styblik@gmail.com>
Date: Fri, 28 Sep 2012 18:47:01 +0000
Subject: [PATCH] ID: 3571153 - OpenIPMI/ipmievd fails to compile on Solaris

Commit fixes compilation problems on Solaris. These were caused by missing
header file, <sys/ioccom.h>, which defines _IO* macros.
---
 ipmitool/configure.in            | 4 ++++
 ipmitool/src/ipmievd.c           | 4 ++++
 ipmitool/src/plugins/open/open.c | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 03bd4e6..07c2f93 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -216,6 +216,10 @@ AC_PREPROC_IFELSE([#include <linux/compiler.h>],
 CPPFLAGS=$ORIG_CPPFLAGS
 AC_SUBST(CPPFLAGS)
 
+AC_CHECK_HEADER([sys/ioccom.h],
+	[AC_DEFINE(HAVE_SYS_IOCCOM_H, [1],
+	[Define to 1 if you have the <sys/ioccom.h> header file.])])
+
 AC_CHECK_HEADER([linux/ipmi.h],
 	[AC_DEFINE(HAVE_OPENIPMI_H, [1],
 	[Define to 1 if you have the <linux/ipmi.h> header file.])],
diff --git a/ipmitool/src/ipmievd.c b/ipmitool/src/ipmievd.c
index 19cdea6..461a890 100644
--- a/ipmitool/src/ipmievd.c
+++ b/ipmitool/src/ipmievd.c
@@ -46,6 +46,10 @@
 # include <config.h>
 #endif
 
+#if defined(HAVE_SYS_IOCCOM_H)
+# include <sys/ioccom.h>
+#endif
+
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
diff --git a/ipmitool/src/plugins/open/open.c b/ipmitool/src/plugins/open/open.c
index 1c06612..6accb9e 100644
--- a/ipmitool/src/plugins/open/open.c
+++ b/ipmitool/src/plugins/open/open.c
@@ -49,6 +49,10 @@
 # include <config.h>
 #endif
 
+#if defined(HAVE_SYS_IOCCOM_H)
+# include <sys/ioccom.h>
+#endif
+
 #if defined(HAVE_OPENIPMI_H)
 # if defined(HAVE_LINUX_COMPILER_H)
 #  include <linux/compiler.h>