From b06630d0e9fe936683acbddf8f1f47711f10bc18 Mon Sep 17 00:00:00 2001
From: shefty <shefty@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Fri, 21 Mar 2008 03:28:30 +0000
Subject: [PATCH] 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
---
 branches/winverbs/core/winverbs/user/wv_base.h | 1 +
 branches/winverbs/core/winverbs/wv_ioctl.h     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/branches/winverbs/core/winverbs/user/wv_base.h b/branches/winverbs/core/winverbs/user/wv_base.h
index 1a1b4ad5..dfa61de0 100644
--- 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_
 
 #include <windows.h>
+#include <winioctl.h>
 
 #include <iba\ib_types.h>
 #include <iba\ib_uvp.h>
diff --git a/branches/winverbs/core/winverbs/wv_ioctl.h b/branches/winverbs/core/winverbs/wv_ioctl.h
index 1ff9223c..6eeb6bb7 100644
--- a/branches/winverbs/core/winverbs/wv_ioctl.h
+++ b/branches/winverbs/core/winverbs/wv_ioctl.h
@@ -32,8 +32,6 @@
 #ifndef _WV_IOCTL_H_
 #define _WV_IOCTL_H_
 
-#include <winioctl.h>
-
 #define WV_IOCTL(f)	CTL_CODE(FILE_DEVICE_INFINIBAND, f, METHOD_BUFFERED,\
 							 FILE_READ_DATA | FILE_WRITE_DATA)
 
-- 
2.41.0