From e7516aebc27066b2ab4e00f8a3c4ff2bd5946339 Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Tue, 5 Apr 2005 20:33:04 +0000
Subject: [PATCH] b=5667

always include our local ioctl.h if _IOW isn't defined, which is
probably only catamount.
---
 lnet/utils/debug.c   | 3 ++-
 lnet/utils/portals.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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>
-- 
1.8.3.1