winverbs: move userspace include file out of common wv_ioctl header

Move #include <winioctl.h> out of wv_ioctl.h.  winioctl.h is needed to build the userspace library, but results in build errors if included by the winverbs driver.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1008 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/winverbs/core/winverbs/user/wv_base.h b/branches/winverbs/core/winverbs/user/wv_base.h
index 1a1b4ad51b069c9f34d8de4fbc7dcdb138592039..dfa61de00cc450386fa0542a29a5d7b26760e7a9 100644 (file)
--- a/branches/winverbs/core/winverbs/user/wv_base.h
+++ b/branches/winverbs/core/winverbs/user/wv_base.h
@@ -33,6 +33,7 @@
 #define _WV_BASE_H_\r
 \r
 #include <windows.h>\r
+#include <winioctl.h>\r
 \r
 #include <iba\ib_types.h>\r
 #include <iba\ib_uvp.h>\r

diff --git a/branches/winverbs/core/winverbs/wv_ioctl.h b/branches/winverbs/core/winverbs/wv_ioctl.h
index 1ff9223ce3ce042dda181e1b462d1db14e976450..6eeb6bb743e72de9ae41636e718d2ab7cf035cde 100644 (file)
--- a/branches/winverbs/core/winverbs/wv_ioctl.h
+++ b/branches/winverbs/core/winverbs/wv_ioctl.h
@@ -32,8 +32,6 @@
 #ifndef _WV_IOCTL_H_\r
 #define _WV_IOCTL_H_\r
 \r
-#include <winioctl.h>\r
-\r
 #define WV_IOCTL(f)    CTL_CODE(FILE_DEVICE_INFINIBAND, f, METHOD_BUFFERED,\\r
                                                         FILE_READ_DATA | FILE_WRITE_DATA)\r
 \r