From d3c90cdcdf56146af89056ed36bfcc7b4d4956c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 17 Feb 2016 20:56:52 +0100
Subject: Imported Upstream version 2.9.8

---
 util/ipmimv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'util/ipmimv.c')

diff --git a/util/ipmimv.c b/util/ipmimv.c
index 4404beb..accda41 100644
--- a/util/ipmimv.c
+++ b/util/ipmimv.c
@@ -112,7 +112,7 @@ struct timeval {
 #endif
 
 int ipmi_timeout_mv = 10;   /* 10 seconds, was 5 sec */
-#if defined(BSD) || defined(MACOS) || defined(HPUX)
+#if defined(BSD7)
 #pragma pack(1)
 #endif
 
@@ -153,8 +153,10 @@ struct ipmi_cmdspec
         unsigned char netfn;
         unsigned char cmd;
 };
-#if defined(BSD) || defined(MACOS) || defined(HPUX)
+#if defined(BSD7)
 #pragma pack()
+#endif
+#if defined(BSD) || defined(MACOS) || defined(HPUX)
 /* FreeBSD 7.x ipmi ioctls, use _IOW */
 #define IPMI_IOC_MAGIC             'i'
 #define IPMICTL_RECEIVE_MSG_TRUNC  _IOWR(IPMI_IOC_MAGIC, 11, struct ipmi_recv)
-- 
cgit v1.2.3