Windows does not require rdma_cma_abi.h, move the include from common code and to...

Signed-off-by: stan smith <stan.smith@intel.com>

diff --git a/dapl/openib_cma/dapl_ib_util.h b/dapl/openib_cma/dapl_ib_util.h
index 451a967d0b53b9e56b70462e891ed612a5131c67..fd4e5828343dd3ccfaa0b11b0c85caa38311f997 100755 (executable)
--- a/dapl/openib_cma/dapl_ib_util.h
+++ b/dapl/openib_cma/dapl_ib_util.h
@@ -33,8 +33,6 @@
 #define _OPENIB_CMA_ 
 
 #include <infiniband/verbs.h>
-#include <rdma/rdma_cma.h>
-#include <rdma/rdma_cma_abi.h>
 #include "openib_osd.h"
 #include "dapl_ib_common.h"
 

diff --git a/dapl/openib_cma/linux/openib_osd.h b/dapl/openib_cma/linux/openib_osd.h
index 309972f979500107129e1a41e7169acb39175842..c537df3dcd10836ae6043cfed941d342ddce2b3c 100644 (file)
--- a/dapl/openib_cma/linux/openib_osd.h
+++ b/dapl/openib_cma/linux/openib_osd.h
@@ -1,6 +1,8 @@
 #ifndef OPENIB_OSD_H
 #define OPENIB_OSD_H
 
+#include <rdma/rdma_cma.h>
+#include <rdma/rdma_cma_abi.h>
 #include <byteswap.h>
 #include <sys/poll.h>
 

diff --git a/dapl/openib_cma/windows/openib_osd.h b/dapl/openib_cma/windows/openib_osd.h
index 581b9088953e5e507218e184c736225e3e6407d5..3290081c949018a1a7f7196809e83beed06c0ade 100644 (file)
--- a/dapl/openib_cma/windows/openib_osd.h
+++ b/dapl/openib_cma/windows/openib_osd.h
@@ -1,3 +1,4 @@
+#include <rdma/rdma_cma.h>\r
 #include <winsock2.h>\r
 #include <ws2tcpip.h>\r
 \r