From f1c16bcbee85498a0b9a40c5547639865c7d61d3 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 12 Jul 2010 12:10:08 -0700
Subject: [PATCH] libibverbs: remove _errno include from verbs.h

verbs.h is intended to be included directly by applications.  Since
_errno.h is a linux header file abstraction, move its use internal
to libibverbs.  This avoids issues if the user includes errno.h
directly.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
---
 trunk/ulp/dapl2/dapl/ibal/SOURCES                    | 2 +-
 trunk/ulp/dapl2/dapl/openib_cma/windows/openib_osd.h | 4 ----
 trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h        | 1 +
 trunk/ulp/dapl2/dat/udat/SOURCES                     | 2 +-
 trunk/ulp/dapl2/dat/udat/windows/dat_osd.h           | 1 +
 trunk/ulp/libibverbs/include/infiniband/verbs.h      | 1 -
 trunk/ulp/libibverbs/src/ibverbs.h                   | 2 ++
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/trunk/ulp/dapl2/dapl/ibal/SOURCES b/trunk/ulp/dapl2/dapl/ibal/SOURCES
index b8c9932a..bb1d7925 100644
--- a/trunk/ulp/dapl2/dapl/ibal/SOURCES
+++ b/trunk/ulp/dapl2/dapl/ibal/SOURCES
@@ -28,7 +28,7 @@ SOURCES=udapl.rc			\
 
 INCLUDES = ..\include;..\common;..\..\dat\include;\
 		   ..\..\dat\udat\windows;..\udapl\windows;\
-		   ..\..\..\..\inc;..\..\..\..\inc\user;
+		   ..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\..\inc\user\linux;
 
 DAPL_OPTS = -DEXPORT_DAPL_SYMBOLS -D_VENDOR_IBAL_ -DDAPL_MERGE_CM_DTO\
 			-DDAT_EXTENSIONS
diff --git a/trunk/ulp/dapl2/dapl/openib_cma/windows/openib_osd.h b/trunk/ulp/dapl2/dapl/openib_cma/windows/openib_osd.h
index 3290081c..ac392b0f 100644
--- a/trunk/ulp/dapl2/dapl/openib_cma/windows/openib_osd.h
+++ b/trunk/ulp/dapl2/dapl/openib_cma/windows/openib_osd.h
@@ -4,7 +4,3 @@
 
 #define ntohll _byteswap_uint64
 #define htonll _byteswap_uint64
-
-#ifndef EADDRNOTAVAIL
-#define EADDRNOTAVAIL	WSAEADDRNOTAVAIL
-#endif
diff --git a/trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h b/trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h
index 5fb9363a..4b9ecbf8 100644
--- a/trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h
+++ b/trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h
@@ -50,6 +50,7 @@
 
 #include <stddef.h>
 #include <complib/cl_types.h>
+#include <_errno.h>
 #pragma warning ( push, 3 )
 #include <winioctl.h>
 #include <stdio.h>
diff --git a/trunk/ulp/dapl2/dat/udat/SOURCES b/trunk/ulp/dapl2/dat/udat/SOURCES
index 7d37f652..4cddf721 100644
--- a/trunk/ulp/dapl2/dat/udat/SOURCES
+++ b/trunk/ulp/dapl2/dat/udat/SOURCES
@@ -19,7 +19,7 @@ SOURCES=udat.rc			\
 	udat_sr_parser.c	\
 	udat_sources.c
 
-INCLUDES=windows;..\common;..\include;
+INCLUDES=windows;..\common;..\include;..\..\..\..\inc\user\linux;
 RCOPTIONS=/I..\..\..\..\inc;
 
 # FIX ME!!! XXX specifically the 4113 warning prior to testing.
diff --git a/trunk/ulp/dapl2/dat/udat/windows/dat_osd.h b/trunk/ulp/dapl2/dat/udat/windows/dat_osd.h
index 6941e465..e661ba32 100644
--- a/trunk/ulp/dapl2/dat/udat/windows/dat_osd.h
+++ b/trunk/ulp/dapl2/dat/udat/windows/dat_osd.h
@@ -57,6 +57,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <_errno.h>
 
 #ifndef STATIC
 #define STATIC static
diff --git a/trunk/ulp/libibverbs/include/infiniband/verbs.h b/trunk/ulp/libibverbs/include/infiniband/verbs.h
index 82cebded..f1a6a7dc 100644
--- a/trunk/ulp/libibverbs/include/infiniband/verbs.h
+++ b/trunk/ulp/libibverbs/include/infiniband/verbs.h
@@ -37,7 +37,6 @@
 
 #include <windows.h>
 #include <rdma\winverbs.h>
-#include <_errno.h>
 #include <comp_channel.h>
 
 #ifdef __cplusplus
diff --git a/trunk/ulp/libibverbs/src/ibverbs.h b/trunk/ulp/libibverbs/src/ibverbs.h
index 11458eff..63eb9685 100644
--- a/trunk/ulp/libibverbs/src/ibverbs.h
+++ b/trunk/ulp/libibverbs/src/ibverbs.h
@@ -30,6 +30,8 @@
 #ifndef IB_VERBS_H
 #define IB_VERBS_H
 
+#include <_errno.h>
+
 extern COMP_MANAGER comp_mgr;
 extern HANDLE heap;
 
-- 
2.46.0