From 7c23a5ad65131df3fb905a343d97ab301569e783 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 23 Nov 2013 22:58:32 +0000 Subject: [PATCH] Fix headers when building with ft enabled. Thanks to Adrian Reber for the patch! This commit was SVN r29743. --- orte/mca/ess/base/ess_base_std_app.c | 1 + orte/mca/ess/base/ess_base_std_orted.c | 1 + orte/mca/ess/env/ess_env_module.c | 2 +- orte/mca/ess/hnp/ess_hnp_module.c | 1 + orte/mca/rml/oob/rml_oob_component.c | 3 +++ orte/mca/snapc/full/snapc_full_global.c | 2 +- orte/mca/snapc/full/snapc_full_local.c | 2 +- orte/mca/sstore/stage/sstore_stage_app.c | 1 + orte/mca/sstore/stage/sstore_stage_component.c | 1 + 9 files changed, 11 insertions(+), 3 deletions(-) diff --git a/orte/mca/ess/base/ess_base_std_app.c b/orte/mca/ess/base/ess_base_std_app.c index c670aaa3d1..dbbb2f4a59 100644 --- a/orte/mca/ess/base/ess_base_std_app.c +++ b/orte/mca/ess/base/ess_base_std_app.c @@ -53,6 +53,7 @@ #include "orte/mca/errmgr/base/base.h" #if OPAL_ENABLE_FT_CR == 1 #include "orte/mca/snapc/base/base.h" +#include "orte/mca/sstore/base/base.h" #endif #include "orte/mca/state/base/base.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/ess/base/ess_base_std_orted.c b/orte/mca/ess/base/ess_base_std_orted.c index 3f228fcc79..ce11f33e30 100644 --- a/orte/mca/ess/base/ess_base_std_orted.c +++ b/orte/mca/ess/base/ess_base_std_orted.c @@ -56,6 +56,7 @@ #include "orte/mca/errmgr/errmgr.h" #if OPAL_ENABLE_FT_CR == 1 #include "orte/mca/snapc/base/base.h" +#include "orte/mca/sstore/base/base.h" #endif #include "orte/mca/filem/base/base.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c index c4ce756fcb..6a71230e27 100644 --- a/orte/mca/ess/env/ess_env_module.c +++ b/orte/mca/ess/env/ess_env_module.c @@ -57,7 +57,7 @@ #include "orte/mca/rmaps/base/base.h" #if OPAL_ENABLE_FT_CR == 1 #include "orte/mca/snapc/base/base.h" -#include "orte/mca/db/db.h" +#include "opal/mca/db/db.h" #endif #include "orte/mca/filem/base/base.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c index 4a7ccb7534..a6f1777038 100644 --- a/orte/mca/ess/hnp/ess_hnp_module.c +++ b/orte/mca/ess/hnp/ess_hnp_module.c @@ -69,6 +69,7 @@ #include "orte/mca/rmaps/base/base.h" #if OPAL_ENABLE_FT_CR == 1 #include "orte/mca/snapc/base/base.h" +#include "orte/mca/sstore/base/base.h" #endif #include "orte/mca/filem/base/base.h" #include "orte/mca/state/base/base.h" diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c index 4e8510964c..dd539cdf0d 100644 --- a/orte/mca/rml/oob/rml_oob_component.c +++ b/orte/mca/rml/oob/rml_oob_component.c @@ -39,6 +39,9 @@ #include "opal/mca/backtrace/backtrace.h" #include "opal/mca/event/event.h" +#if OPAL_ENABLE_FT_CR == 1 +#include "orte/mca/rml/rml.h" +#endif #include "orte/mca/rml/base/base.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c index 1992966206..8f1317b97d 100644 --- a/orte/mca/snapc/full/snapc_full_global.c +++ b/orte/mca/snapc/full/snapc_full_global.c @@ -34,6 +34,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" +#include "opal/mca/db/db.h" #include "orte/util/name_fns.h" #include "orte/util/proc_info.h" @@ -45,7 +46,6 @@ #include "orte/mca/rmaps/rmaps_types.h" #include "orte/mca/plm/plm.h" #include "orte/mca/grpcomm/grpcomm.h" -#include "orte/mca/db/db.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/base/base.h" diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c index 895bbf6cea..0975d77070 100644 --- a/orte/mca/snapc/full/snapc_full_local.c +++ b/orte/mca/snapc/full/snapc_full_local.c @@ -51,6 +51,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" +#include "opal/mca/db/db.h" #include "orte/util/show_help.h" #include "orte/util/name_fns.h" @@ -63,7 +64,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/routed/routed.h" #include "orte/mca/grpcomm/grpcomm.h" -#include "orte/mca/db/db.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" diff --git a/orte/mca/sstore/stage/sstore_stage_app.c b/orte/mca/sstore/stage/sstore_stage_app.c index 50ecf488f6..10d38adc1b 100644 --- a/orte/mca/sstore/stage/sstore_stage_app.c +++ b/orte/mca/sstore/stage/sstore_stage_app.c @@ -47,6 +47,7 @@ #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/errmgr/errmgr.h" +#include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/sstore/sstore.h" diff --git a/orte/mca/sstore/stage/sstore_stage_component.c b/orte/mca/sstore/stage/sstore_stage_component.c index 4dd0210569..19d7c75d13 100644 --- a/orte/mca/sstore/stage/sstore_stage_component.c +++ b/orte/mca/sstore/stage/sstore_stage_component.c @@ -10,6 +10,7 @@ #include "orte_config.h" #include "opal/util/output.h" +#include "opal/util/opal_environ.h" #include "orte/constants.h" #include "orte/mca/sstore/sstore.h"