From eaa57e29b6be786854be29a3cd4d053977593238 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 9 Feb 2009 14:14:45 +0000 Subject: [PATCH] Revert r20480 as this breaks the trunk. The dpm.h include file has defines for OMPI_RML tags that are required for wireup. This commit was SVN r20482. The following SVN revision numbers were found above: r20480 --> open-mpi/ompi@62282fefe5c19a1ccdb40f3ab1a4d34188cce7bb --- ompi/mca/btl/openib/connect/btl_openib_connect_oob.c | 1 + ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c | 1 + ompi/mca/btl/udapl/btl_udapl_endpoint.c | 1 + 3 files changed, 3 insertions(+) diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c index 958bfd5f83..2f593cd94e 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c @@ -31,6 +31,7 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" +#include "ompi/mca/dpm/dpm.h" #include "btl_openib.h" #include "btl_openib_endpoint.h" diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c index 237d744e32..dae3f33968 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c @@ -17,6 +17,7 @@ #include "orte/util/name_fns.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" +#include "ompi/mca/dpm/dpm.h" #include "btl_openib.h" #include "btl_openib_endpoint.h" diff --git a/ompi/mca/btl/udapl/btl_udapl_endpoint.c b/ompi/mca/btl/udapl/btl_udapl_endpoint.c index b47954a4c3..8d72e0af61 100644 --- a/ompi/mca/btl/udapl/btl_udapl_endpoint.c +++ b/ompi/mca/btl/udapl/btl_udapl_endpoint.c @@ -36,6 +36,7 @@ #include "ompi/class/ompi_free_list.h" #include "ompi/mca/mpool/rdma/mpool_rdma.h" +#include "ompi/mca/dpm/dpm.h" #include "ompi/mca/btl/base/btl_base_error.h" #include "btl_udapl.h"