From: jacob <jacob>
Date: Tue, 5 Apr 2005 20:33:04 +0000 (+0000)
Subject: b=5667
X-Git-Tag: v1_7_100~1478
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e7516aebc27066b2ab4e00f8a3c4ff2bd5946339;hp=62619ee5e4e0df98c0dbb5190616a532f0fc303f

b=5667

always include our local ioctl.h if _IOW isn't defined, which is
probably only catamount.
---

diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c
index ba8b790..418fdbc 100644
--- a/lnet/utils/debug.c
+++ b/lnet/utils/debug.c
@@ -34,7 +34,8 @@
 #include <string.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#else
+#endif
+#ifndef _IOWR
 #include "ioctl.h"
 #endif
 #include <fcntl.h>
diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c
index e3f5916..a9f2e35 100644
--- a/lnet/utils/portals.c
+++ b/lnet/utils/portals.c
@@ -34,7 +34,8 @@
 #include <fcntl.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#else
+#endif
+#ifndef _IOWR
 #include "ioctl.h"
 #endif
 #include <errno.h>