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>

diff --git a/trunk/ulp/dapl2/dapl/ibal/SOURCES b/trunk/ulp/dapl2/dapl/ibal/SOURCES
index b8c9932a622f43479d51f4df74453e07fe5e8059..bb1d7925bac50cffeb2dc80a52e2713b9651bd0e 100644 (file)
--- 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 3290081c949018a1a7f7196809e83beed06c0ade..ac392b0fce24ea32760844908c1cc296393f4ea0 100644 (file)
--- 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 @@
 \r
 #define ntohll _byteswap_uint64\r
 #define htonll _byteswap_uint64\r
-\r
-#ifndef EADDRNOTAVAIL\r
-#define EADDRNOTAVAIL  WSAEADDRNOTAVAIL\r
-#endif\r

diff --git a/trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h b/trunk/ulp/dapl2/dapl/udapl/windows/dapl_osd.h
index 5fb9363aab7c090981a76bf44285741ec2492ffa..4b9ecbf875253859cc8529c0c39c3b9624a6b559 100644 (file)
--- 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 7d37f652c19faeb04bc514d3c6d0065013739f5d..4cddf721c607c76a3bda3989358a4193ccecc144 100644 (file)
--- 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 6941e465c23948306f84d73cf40324fd23307d2b..e661ba32b8cea36354122bf8f89e3802b2236606 100644 (file)
--- 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 82cebded23555ca366f509a17cb50077602f896f..f1a6a7dc672f99c031a00a4dc8e3d1ded0a72548 100644 (file)
--- a/trunk/ulp/libibverbs/include/infiniband/verbs.h
+++ b/trunk/ulp/libibverbs/include/infiniband/verbs.h
@@ -37,7 +37,6 @@
 \r
 #include <windows.h>\r
 #include <rdma\winverbs.h>\r
-#include <_errno.h>\r
 #include <comp_channel.h>\r
 \r
 #ifdef __cplusplus\r

diff --git a/trunk/ulp/libibverbs/src/ibverbs.h b/trunk/ulp/libibverbs/src/ibverbs.h
index 11458eff877839331f213c567741f4c3fc37bd02..63eb96853cc904546d91699dd164a01d0018ad3c 100644 (file)
--- a/trunk/ulp/libibverbs/src/ibverbs.h
+++ b/trunk/ulp/libibverbs/src/ibverbs.h
@@ -30,6 +30,8 @@
 #ifndef IB_VERBS_H\r
 #define IB_VERBS_H\r
 \r
+#include <_errno.h>\r
+\r
 extern COMP_MANAGER comp_mgr;\r
 extern HANDLE heap;\r
 \r