From 6c1cce8761cb584aa0c4beee3fd8149e7daa68c8 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 29 Apr 2009 00:49:23 +0000 Subject: [PATCH] - For the upcoming header cleanup commit, several header files (previously included by header-files) now have to be moved "upward". This is mainly system headers such as string.h, stdio.h and for networking, but also some orte headers. This commit was SVN r21095. --- ompi/info/info.c | 3 ++- ompi/mca/btl/openib/btl_openib.h | 1 + .../pml/v/mca/vprotocol/base/vprotocol_base_select.c | 5 +++++ ompi/runtime/ompi_mpi_params.c | 1 + ompi/tools/ompi-probe/ompi-probe.c | 1 + ompi/tools/ompi-server/ompi-server.c | 4 ++++ opal/util/sys_limits.c | 4 ++++ orte/mca/ess/slurm/ess_slurm_module.c | 10 ++++++++++ orte/mca/grpcomm/bad/grpcomm_bad_module.c | 1 + orte/mca/grpcomm/basic/grpcomm_basic_module.c | 1 + orte/mca/odls/base/odls_base_open.c | 4 ++++ orte/mca/plm/base/plm_base_orted_cmds.c | 3 +++ orte/mca/plm/tm/plm_tm_module.c | 4 ++++ orte/mca/rmaps/base/rmaps_base_open.c | 4 ++++ orte/mca/rml/base/rml_base_receive.c | 5 +++++ orte/mca/rml/oob/rml_oob_component.c | 4 ++++ orte/runtime/data_type_support/orte_dt_compare_fns.c | 4 ++++ orte/runtime/orte_data_server.c | 4 ++++ orte/tools/orterun/orterun.h | 1 + orte/util/parse_options.c | 1 + 20 files changed, 64 insertions(+), 1 deletion(-) diff --git a/ompi/info/info.c b/ompi/info/info.c index 0b2484611c..59f194b9e9 100644 --- a/ompi/info/info.c +++ b/ompi/info/info.c @@ -20,7 +20,6 @@ */ #include "ompi_config.h" -#include "opal/util/output.h" #ifdef HAVE_STRING_H #include @@ -32,6 +31,8 @@ #include #include +#include "opal/util/output.h" +#include "opal/util/strncpy.h" #include "ompi/constants.h" #include "ompi/info/info.h" #include "ompi/runtime/params.h" diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h index 5a248b649e..90adcfc2a2 100644 --- a/ompi/mca/btl/openib/btl_openib.h +++ b/ompi/mca/btl/openib/btl_openib.h @@ -35,6 +35,7 @@ /* Open MPI includes */ #include "ompi/class/ompi_free_list.h" #include "opal/class/opal_pointer_array.h" +#include "opal/class/opal_hash_table.h" #include "opal/util/output.h" #include "opal/event/event.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/pml/v/mca/vprotocol/base/vprotocol_base_select.c b/ompi/mca/pml/v/mca/vprotocol/base/vprotocol_base_select.c index b922d6684a..e3c312c6a1 100644 --- a/ompi/mca/pml/v/mca/vprotocol/base/vprotocol_base_select.c +++ b/ompi/mca/pml/v/mca/vprotocol/base/vprotocol_base_select.c @@ -9,6 +9,11 @@ */ #include "ompi_config.h" + +#ifdef HAVE_STRING_H +#include +#endif + #include "base.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/ompi/runtime/ompi_mpi_params.c b/ompi/runtime/ompi_mpi_params.c index 440b079319..45519160be 100644 --- a/ompi/runtime/ompi_mpi_params.c +++ b/ompi/runtime/ompi_mpi_params.c @@ -29,6 +29,7 @@ #endif /* HAVE_TIME_H */ #include "ompi/constants.h" +#include "ompi/datatype/datatype.h" #include "ompi/runtime/mpiruntime.h" #include "ompi/runtime/params.h" #include "ompi/datatype/datatype.h" diff --git a/ompi/tools/ompi-probe/ompi-probe.c b/ompi/tools/ompi-probe/ompi-probe.c index 7761523b8e..01b25af8df 100644 --- a/ompi/tools/ompi-probe/ompi-probe.c +++ b/ompi/tools/ompi-probe/ompi-probe.c @@ -20,6 +20,7 @@ */ #include "ompi_config.h" +#include "ompi/constants.h" #include "mpi.h" #include diff --git a/ompi/tools/ompi-server/ompi-server.c b/ompi/tools/ompi-server/ompi-server.c index e9e36fab01..8aa30bae8c 100644 --- a/ompi/tools/ompi-server/ompi-server.c +++ b/ompi/tools/ompi-server/ompi-server.c @@ -22,6 +22,10 @@ #include "orte_config.h" #include "orte/constants.h" +#ifdef HAVE_STRING_H +#include +#endif + #include #include #ifdef HAVE_UNISTD_H diff --git a/opal/util/sys_limits.c b/opal/util/sys_limits.c index f6a1f97065..dda1b9822a 100644 --- a/opal/util/sys_limits.c +++ b/opal/util/sys_limits.c @@ -22,6 +22,10 @@ #include "opal_config.h" +#ifdef HAVE_STRING_H +#include +#endif + #include #ifdef HAVE_SYS_TYPES_H #include diff --git a/orte/mca/ess/slurm/ess_slurm_module.c b/orte/mca/ess/slurm/ess_slurm_module.c index 708c1025cf..90a4022220 100644 --- a/orte/mca/ess/slurm/ess_slurm_module.c +++ b/orte/mca/ess/slurm/ess_slurm_module.c @@ -21,6 +21,16 @@ #include "orte_config.h" #include "orte/constants.h" +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif + #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/orte/mca/grpcomm/bad/grpcomm_bad_module.c b/orte/mca/grpcomm/bad/grpcomm_bad_module.c index 826142aabf..2210bc03ec 100644 --- a/orte/mca/grpcomm/bad/grpcomm_bad_module.c +++ b/orte/mca/grpcomm/bad/grpcomm_bad_module.c @@ -31,6 +31,7 @@ #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/odls/base/base.h" +#include "orte/mca/odls/odls_types.h" #include "orte/mca/ess/ess.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" diff --git a/orte/mca/grpcomm/basic/grpcomm_basic_module.c b/orte/mca/grpcomm/basic/grpcomm_basic_module.c index 9ba4ed792c..d1cf84a27c 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic_module.c +++ b/orte/mca/grpcomm/basic/grpcomm_basic_module.c @@ -33,6 +33,7 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ess/ess.h" #include "orte/mca/odls/base/base.h" +#include "orte/mca/odls/odls_types.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/odls/base/odls_base_open.c b/orte/mca/odls/base/odls_base_open.c index 806f55f6de..2a6a5256e5 100644 --- a/orte/mca/odls/base/odls_base_open.c +++ b/orte/mca/odls/base/odls_base_open.c @@ -20,6 +20,10 @@ #include "orte_config.h" #include "orte/constants.h" +#ifdef HAVE_STRING_H +#include +#endif + #if !ORTE_DISABLE_FULL_SUPPORT #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/plm/base/plm_base_orted_cmds.c b/orte/mca/plm/base/plm_base_orted_cmds.c index 60eaf0f75e..d7c10609cc 100644 --- a/orte/mca/plm/base/plm_base_orted_cmds.c +++ b/orte/mca/plm/base/plm_base_orted_cmds.c @@ -20,6 +20,9 @@ #include "orte_config.h" #include "orte/constants.h" +#ifdef HAVE_STRING_H +#include +#endif #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/orte/mca/plm/tm/plm_tm_module.c b/orte/mca/plm/tm/plm_tm_module.c index d3f70b0188..97376ba894 100644 --- a/orte/mca/plm/tm/plm_tm_module.c +++ b/orte/mca/plm/tm/plm_tm_module.c @@ -29,6 +29,10 @@ #include "orte/constants.h" #include "orte/types.h" +#ifdef HAVE_STRING_H +#include +#endif + #if HAVE_UNISTD_H #include #endif diff --git a/orte/mca/rmaps/base/rmaps_base_open.c b/orte/mca/rmaps/base/rmaps_base_open.c index f46541a228..b2bd9b44af 100644 --- a/orte/mca/rmaps/base/rmaps_base_open.c +++ b/orte/mca/rmaps/base/rmaps_base_open.c @@ -20,6 +20,10 @@ #include "orte_config.h" #include "orte/constants.h" +#ifdef HAVE_STRING_H +#include +#endif + #if !ORTE_DISABLE_FULL_SUPPORT #include "opal/mca/mca.h" diff --git a/orte/mca/rml/base/rml_base_receive.c b/orte/mca/rml/base/rml_base_receive.c index edb553546a..a39855e0b9 100644 --- a/orte/mca/rml/base/rml_base_receive.c +++ b/orte/mca/rml/base/rml_base_receive.c @@ -26,6 +26,11 @@ * includes */ #include "orte_config.h" + +#ifdef HAVE_STRING_H +#include +#endif + #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c index f1b64d1ddf..12d8c7fea2 100644 --- a/orte/mca/rml/oob/rml_oob_component.c +++ b/orte/mca/rml/oob/rml_oob_component.c @@ -20,6 +20,10 @@ #include "orte_config.h" #include "orte/constants.h" +#ifdef HAVE_ARPA_INET_H +#include +#endif + #include "opal/mca/base/base.h" #include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/runtime/data_type_support/orte_dt_compare_fns.c b/orte/runtime/data_type_support/orte_dt_compare_fns.c index 2e232512f8..48aebae0c9 100644 --- a/orte/runtime/data_type_support/orte_dt_compare_fns.c +++ b/orte/runtime/data_type_support/orte_dt_compare_fns.c @@ -16,6 +16,10 @@ #include "orte_config.h" +#ifdef HAVE_STRING_H +#include +#endif + #include #include "opal/dss/dss.h" diff --git a/orte/runtime/orte_data_server.c b/orte/runtime/orte_data_server.c index 534d433146..7b962efc94 100644 --- a/orte/runtime/orte_data_server.c +++ b/orte/runtime/orte_data_server.c @@ -21,6 +21,10 @@ #include "orte/constants.h" #include "orte/types.h" +#ifdef HAVE_STRING_H +#include +#endif + #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/orte/tools/orterun/orterun.h b/orte/tools/orterun/orterun.h index 8d96469abb..0cfccc5973 100644 --- a/orte/tools/orterun/orterun.h +++ b/orte/tools/orterun/orterun.h @@ -23,6 +23,7 @@ #include "orte_config.h" #include "opal/threads/condition.h" +#include "opal/threads/mutex.h" #include "opal/util/cmd_line.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/util/parse_options.c b/orte/util/parse_options.c index d1cc334914..d9ec2f67d6 100644 --- a/orte/util/parse_options.c +++ b/orte/util/parse_options.c @@ -20,6 +20,7 @@ #include "orte_config.h" #include "orte/constants.h" +#include #include #include #ifdef HAVE_UNISTD_H