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 (file)
--- 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 (file)
--- 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>