From 24a46f2acb5be2a685b0f16536cc3d301b09f0b5 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 12 Oct 2011 16:54:03 +0000 Subject: [PATCH] These were missed by prior commit - need to remove lingering references to OPAL_HWLOC_HAVE_XML This commit was SVN r25272. --- orte/mca/plm/base/plm_base_launch_support.c | 2 +- orte/orted/orted_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c index 662f6d5b06..1723d6f819 100644 --- a/orte/mca/plm/base/plm_base_launch_support.c +++ b/orte/mca/plm/base/plm_base_launch_support.c @@ -538,7 +538,7 @@ static void process_orted_launch_report(int fd, short event, void *data) goto CLEANUP; } -#if OPAL_HAVE_HWLOC && OPAL_HAVE_HWLOC_XML +#if OPAL_HAVE_HWLOC /* store the local resources for that node */ { hwloc_topology_t topo, t; diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c index 12addd1626..9434081ae2 100644 --- a/orte/orted/orted_main.c +++ b/orte/orted/orted_main.c @@ -641,7 +641,7 @@ int orte_daemon(int argc, char *argv[]) /* include our node name */ opal_dss.pack(buffer, &orte_process_info.nodename, 1, OPAL_STRING); -#if OPAL_HAVE_HWLOC && OPAL_HAVE_HWLOC_XML +#if OPAL_HAVE_HWLOC /* add the local topology */ if (NULL != opal_hwloc_topology) { if (ORTE_SUCCESS != (ret = opal_dss.pack(buffer, &opal_hwloc_topology, 1, OPAL_HWLOC_TOPO))) {