From: jacob <jacob>
Date: Tue, 5 Apr 2005 20:33:00 +0000 (+0000)
Subject: b=5667
X-Git-Tag: v1_8_0_110~486^7~56
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=5728a14f1a2c57eee73fa48dd6877b2c5ccc1aa4;p=fs%2Flustre-release.git

b=5667

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

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index d6f0cd9..b6b3a6a 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -36,9 +36,10 @@
 #endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
-#else
+#endif
+#ifndef _IOWR
 # include "ioctl.h"
-#endif /* !HAVE_SYS_IOCTL_H */
+#endif
 
 #include <stdio.h>
 #include <sys/ioctl.h>