MTL MXM: make MXM use MXM_VERSION macro for MXM version checking.

This commit was SVN r26952.

ompi/mca/mtl/mxm/mtl_mxm.c

@@ -400,7 +400,7 @@ int ompi_mtl_mxm_progress(void)
     return 1;
 }
 
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
 OBJ_CLASS_INSTANCE(
         ompi_mtl_mxm_message_t,
         ompi_free_list_item_t,

ompi/mca/mtl/mxm/mtl_mxm.h

@@ -28,6 +28,10 @@
 
 BEGIN_C_DECLS
 
+#ifndef MXM_VERSION
+#define MXM_VERSION(major, minor) (((major)<<MXM_MAJOR_BIT)|((minor)<<MXM_MINOR_BIT))
+#endif
+
 /* MTL interface functions */
 extern int ompi_mtl_mxm_add_procs(struct mca_mtl_base_module_t* mtl,
                                   size_t nprocs, struct ompi_proc_t** procs,
@@ -84,7 +88,7 @@ extern int ompi_mtl_mxm_finalize(struct mca_mtl_base_module_t* mtl);
 
 int ompi_mtl_mxm_module_init(void);
 
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
 struct ompi_mtl_mxm_message_t {
     ompi_free_list_item_t super;
 

ompi/mca/mtl/mxm/mtl_mxm_component.c

@@ -99,7 +99,7 @@ static int ompi_mtl_mxm_component_open(void)
         return OPAL_ERR_NOT_AVAILABLE;
     }
 
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
 {
     int rc;
 
@@ -129,7 +129,7 @@ static int ompi_mtl_mxm_component_close(void)
     mxm_cleanup(ompi_mtl_mxm.mxm_context);
     ompi_mtl_mxm.mxm_context = NULL;
 
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
     OBJ_DESTRUCT(&mca_mtl_mxm_component.mxm_messages);
 #endif
 

ompi/mca/mtl/mxm/mtl_mxm_probe.c

@@ -51,7 +51,7 @@ int ompi_mtl_mxm_improbe(struct mca_mtl_base_module_t *mtl,
                          struct ompi_message_t **message,
                          struct ompi_status_public_t *status)
 {
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
     int rc;
     mxm_error_t err;
     mxm_recv_req_t req;

ompi/mca/mtl/mxm/mtl_mxm_recv.c

@@ -102,7 +102,7 @@ int ompi_mtl_mxm_imrecv(struct mca_mtl_base_module_t* mtl,
                         struct ompi_message_t **message,
                         struct mca_mtl_request_t *mtl_request)
 {
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
     int ret;
     mxm_error_t err;
     mxm_recv_req_t *mxm_recv_req;

ompi/mca/mtl/mxm/mtl_mxm_types.h

@@ -43,7 +43,7 @@ extern mca_mtl_mxm_module_t ompi_mtl_mxm;
 typedef struct mca_mtl_mxm_component_t {
     mca_mtl_base_component_2_0_0_t super; /**< base MTL component */
 
-#if MXM_API >= 0x01010000
+#if MXM_API >= MXM_VERSION(1,5)
     ompi_free_list_t mxm_messages; /* will be used for MPI_Mprobe and MPI_Mrecv calls */
 #endif