[openib-general] [PATCH 3/3] osm: Changes for windows compatability

[Yevgeny Kliteynik]

Hi Hal.

Fixing windows compilation problems.

Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
---
 osm/osmtest/osmtest.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osm/osmtest/osmtest.c b/osm/osmtest/osmtest.c
index 0ccc06c..05b1134 100644
--- a/osm/osmtest/osmtest.c
+++ b/osm/osmtest/osmtest.c
@@ -471,10 +471,13 @@ osmtest_destroy( IN osmtest_t * const p_
 {
   cl_map_item_t *p_item,*p_next_item;
 
+  /* Currently there is a problem with IBAL exit flow - memory overrun,
+     so bypass vendor deletion - it will be cleaned by the Windows OS */
+#ifndef __WIN__
   if( p_osmt->p_vendor )
-  {
     osm_vendor_delete( &p_osmt->p_vendor );
-  }
+#endif
+
   cl_qpool_destroy( &p_osmt->port_pool );
   cl_qpool_destroy( &p_osmt->node_pool );
 
@@ -4922,7 +4925,7 @@ osmtest_informinfo_request(
     /* as currently no comp mask bits defined for InformInfo!!! */
     user.comp_mask = IB_IIR_COMPMASK_SUBSCRIBE;
     p_inform_info_opt = p_options;
-    rec.subscribe = p_inform_info_opt->subscribe;
+    rec.subscribe = (uint8_t)p_inform_info_opt->subscribe;
     if (p_inform_info_opt->qpn)
     {
       rec.g_or_v.generic.qpn_resp_time_val = cl_hton32(p_inform_info_opt->qpn) >> 8;
@@ -5601,7 +5604,7 @@ osmtest_validate_against_db( IN osmtest_
 #ifdef DUAL_SIDED_RMPP
   osmv_multipath_req_t request;
 #endif
-  int i; 
+  uint8_t i; 
 #endif
 
   OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_against_db );
-- 
1.4.4.1.GIT