diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-02-17 20:56:52 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-02-17 20:56:52 +0100 |
commit | d3c90cdcdf56146af89056ed36bfcc7b4d4956c5 (patch) | |
tree | 501b20343861a704020ca37b8e65fd2211dcb353 /util/ipmimv.c | |
parent | ee6c7128ed0d58cb1812049463a13bba9cfb31b7 (diff) |
Imported Upstream version 2.9.8upstream/2.9.8
Diffstat (limited to 'util/ipmimv.c')
-rw-r--r-- | util/ipmimv.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) |