Fix casts so trunk compiles

This commit was SVN r23381.

ompi/mca/btl/openib/btl_openib_component.c

@@ -15,7 +15,7 @@
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
- * Copyright (c) 2009-2010 Oracle and/or its affiliates.  All rights reserved
+ * Copyright (c) 2009-2010 Oracle and/or its affiliates.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -2311,8 +2311,8 @@ struct dev_distance {
 
 static int compare_distance(const void *p1, const void *p2)
 {
-    const struct dev_distance *d1 = (const dev_distance *) p1;
-    const struct dev_distance *d2 = (const dev_distance *) p2;
+    const struct dev_distance *d1 = (const struct dev_distance *) p1;
+    const struct dev_distance *d2 = (const struct dev_distance *) p2;
 
     return d1->distance - d2->distance;
 }
@@ -2321,7 +2321,7 @@ static struct dev_distance *
 sort_devs_by_distance(struct ibv_device **ib_devs, int count)
 {
     int i;
-    struct dev_distance *devs = (dev_distance *) malloc(count * sizeof(struct dev_distance));
+    struct dev_distance *devs = (struct dev_distance *) malloc(count * sizeof(struct dev_distance));
 
     opal_carto_base_get_host_graph(&host_topo, "Infiniband");
 

ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

@@ -289,7 +289,7 @@ static int qp_connect_all(mca_btl_openib_endpoint_t *endpoint)
     for (i = 0; i < mca_btl_openib_component.num_qps; i++) {
         struct ibv_qp_attr attr;
         struct ibv_qp* qp = endpoint->qps[i].qp->lcl_qp;
-        enum ibv_mtu mtu = (ibv_mtu) ((openib_btl->device->mtu < endpoint->rem_info.rem_mtu) ?
+        enum ibv_mtu mtu = (enum ibv_mtu) ((openib_btl->device->mtu < endpoint->rem_info.rem_mtu) ?
             openib_btl->device->mtu : endpoint->rem_info.rem_mtu) ;
 
         memset(&attr, 0, sizeof(attr));