Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb982ac)
b=5667
authorjacob <jacob>
Tue, 5 Apr 2005 20:33:00 +0000 (20:33 +0000)
committerjacob <jacob>
Tue, 5 Apr 2005 20:33:00 +0000 (20:33 +0000)
always include our local ioctl.h if _IOW isn't defined, which is
probably only catamount.

lustre/include/liblustre.h patch | blob | history

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index d6f0cd9..b6b3a6a 100644 (file)
--- 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>
Lustre primary development and releases