- Get pgcc on XT to complain less:

In case we use memcmp, strlen, strup and friends include <string.h>
   Also several constants.h are not included directly
 - Let's have mca_topo_base_cart_create  return ompi-errors in
   ompi/mca/topo/base/topo_base_cart_create.c

This commit was SVN r20773.

ompi/datatype/dt_args.c

@@ -22,6 +22,8 @@
 #include "opal/align.h"
 #include "ompi/constants.h"
 
+#include "orte/types.h"
+
 #include "mpi.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/datatype_internal.h"

ompi/errhandler/errhandler.c

@@ -21,6 +21,10 @@
 
 #include "ompi_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "ompi/communicator/communicator.h"
 #include "ompi/win/win.h"
 #include "ompi/file/file.h"

ompi/mca/coll/hierarch/coll_hierarch.h

@@ -26,11 +26,14 @@
 #define TWO_LEVELS 2
 
 #include "ompi_config.h"
+#include "ompi/constants.h"
 
 #include "mpi.h"
+#include "opal/class/opal_pointer_array.h"
 #include "opal/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
+#include "ompi/communicator/communicator.h"
 
 BEGIN_C_DECLS
 

ompi/mca/coll/inter/coll_inter_allgather.c

@@ -25,6 +25,8 @@
 #include "mpi.h"
 #include "ompi/constants.h"
 #include "ompi/datatype/datatype.h"
+#include "ompi/request/request.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/coll/base/coll_tags.h"

ompi/mca/coll/inter/coll_inter_allgatherv.c

@@ -22,6 +22,8 @@
 
 #include "mpi.h"
 #include "ompi/datatype/datatype.h"
+#include "ompi/request/request.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/constants.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"

ompi/mca/coll/inter/coll_inter_allreduce.c

@@ -23,6 +23,8 @@
 #include "mpi.h"
 #include "ompi/constants.h"
 #include "ompi/datatype/datatype.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/request/request.h"
 #include "ompi/op/op.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"

ompi/mca/coll/sync/coll_sync_module.c

@@ -18,13 +18,18 @@
  */
 
 #include "ompi_config.h"
-#include "coll_sync.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdio.h>
 
+#include "coll_sync.h"
+
 #include "mpi.h"
 
 #include "orte/util/show_help.h"
+#include "orte/util/proc_info.h"
 
 #include "ompi/constants.h"
 #include "ompi/communicator/communicator.h"

ompi/mca/op/base/op_base_open.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"

ompi/mca/osc/pt2pt/osc_pt2pt.c

@@ -26,6 +26,7 @@
 #include "opal/threads/mutex.h"
 #include "ompi/win/win.h"
 #include "ompi/communicator/communicator.h"
+#include "ompi/request/request.h"
 #include "mpi.h"
 
 

ompi/mca/osc/pt2pt/osc_pt2pt_comm.c

@@ -19,10 +19,15 @@
 
 #include <stdio.h>
 
+#include "opal/class/opal_list.h"
+#include "opal/threads/mutex.h"
 #include "osc_pt2pt.h"
 #include "osc_pt2pt_sendreq.h"
 #include "osc_pt2pt_header.h"
 #include "osc_pt2pt_data_move.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/op/op.h"
+#include "ompi/win/win.h"
 #include "ompi/memchecker.h"
 
 static int

ompi/mca/osc/rdma/osc_rdma_longreq.h

@@ -23,7 +23,9 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_free_list.h"
+#include "ompi/datatype/datatype.h"
 #include "ompi/request/request.h"
+#include "ompi/op/op.h"
 
 struct ompi_osc_rdma_longreq_t;
 typedef struct ompi_osc_rdma_longreq_t ompi_osc_rdma_longreq_t;

ompi/mca/pml/base/pml_base_open.c

@@ -22,6 +22,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif  /* HAVE_UNIST_H */

ompi/mca/pml/base/pml_base_request.h

@@ -24,6 +24,7 @@
 
 #include "ompi_config.h"
 #include "ompi/class/ompi_free_list.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/request/request.h"
 #include "ompi/datatype/convertor.h"
 

ompi/mca/pml/base/pml_base_select.c

@@ -19,6 +19,10 @@
 
 #include "ompi_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "orte/util/show_help.h"

ompi/mca/pml/cm/pml_cm.h

@@ -21,6 +21,8 @@
 #include "ompi/mca/pml/base/base.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/request/request.h"
 #include "opal/class/opal_free_list.h"
 #include "ompi/mca/mtl/mtl.h"
 

ompi/mca/topo/base/topo_base_cart_create.c

@@ -18,6 +18,8 @@
  */
 
 #include "ompi_config.h"
+#include "ompi/constants.h"
+
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/group/group.h"
@@ -38,7 +40,7 @@
  *
  * Open MPI currently ignores the 'reorder' flag.
  *
- * @retval MPI_SUCCESS
+ * @retval OMPI_SUCCESS
  */                       
 
 int mca_topo_base_cart_create (mca_topo_base_comm_t *topo_data,
@@ -82,7 +84,7 @@ int mca_topo_base_cart_create (mca_topo_base_comm_t *topo_data,
    if (*new_rank > (nprocs-1)) {
        /* sorry, but in our scheme this process is cut off */
        *new_rank = MPI_UNDEFINED;
-       return MPI_SUCCESS;
+       return OMPI_SUCCESS;
    }
 
    /* Have to replace this with the actual function body itself */
@@ -100,5 +102,5 @@ int mca_topo_base_cart_create (mca_topo_base_comm_t *topo_data,
     }
 
    /* end here */
-   return MPI_SUCCESS;
+   return OMPI_SUCCESS;
 }

ompi/mpi/c/add_error_class.c

@@ -21,6 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/errhandler/errcode.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES

ompi/mpi/f77/prototypes_mpi.h

@@ -43,6 +43,10 @@
 #define OMPI_F77_PROTOTYPES_MPI_H
 
 #include "ompi_config.h"
+#include "ompi/errhandler/errhandler.h"
+#include "ompi/attribute/attribute.h"
+#include "ompi/op/op.h"
+#include "ompi/request/grequest.h"
 #include "ompi/mpi/f77/datarep.h"
 
 /* These are the prototypes for the "real" back-end fortran functions. */

ompi/proc/proc.h

@@ -39,6 +39,8 @@
 #include "opal/mca/paffinity/paffinity.h"
 
 #include "orte/runtime/orte_globals.h"
+#include "orte/types.h"
+
 
 BEGIN_C_DECLS
 

ompi/runtime/ompi_mpi_params.c

@@ -21,6 +21,9 @@
 
 #include "ompi_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #if HAVE_TIME_H
 #include <time.h>
 #endif  /* HAVE_TIME_H */

ompi/tools/ompi-profiler/ompi-profiler.c

@@ -24,6 +24,9 @@
 #include "opal/types.h"
 #include "opal/version.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>

opal/mca/crs/base/crs_base_fns.c

@@ -18,6 +18,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

opal/mca/crs/base/crs_base_open.c

@@ -18,6 +18,10 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/constants.h"

opal/mca/crs/none/crs_none_module.c

@@ -11,6 +11,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <sys/types.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>

opal/mca/installdirs/base/installdirs_base_components.c

@@ -12,6 +12,7 @@
 
 #include "opal_config.h"
 
+#include "opal/constants.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/mca/installdirs/base/base.h"

opal/mca/installdirs/env/opal_installdirs_env.c

@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "opal/constants.h"
 #include "opal/mca/installdirs/installdirs.h"
 
 static int installdirs_env_open(void);

opal/mca/memory/ptmalloc2/opal_ptmalloc2_component.c

@@ -18,6 +18,7 @@
 
 #include "opal_config.h"
 
+#include "opal/constants.h"
 #include "opal/mca/memory/memory.h"
 #include "opal/memoryhooks/memory.h"
 

opal/mca/paffinity/base/paffinity_base_service.c

@@ -21,6 +21,11 @@
  */
 
 #include "opal_config.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/util/argv.h"
 #include "opal/constants.h"
 #include "opal/mca/paffinity/paffinity.h"

opal/mca/paffinity/base/paffinity_base_wrappers.c

@@ -21,6 +21,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif

opal/mca/timer/linux/timer_linux_component.c

@@ -18,6 +18,10 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/mca/timer/timer.h"
 #include "opal/mca/timer/linux/timer_linux.h"
 #include "opal/constants.h"

opal/runtime/opal_cr.c

@@ -26,6 +26,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

opal/util/arch.c

@@ -18,6 +18,7 @@
  */
 #include "opal_config.h"
 
+#include "opal/constants.h"
 #include "opal/util/arch.h"
 
 int32_t opal_arch_compute_local_id( uint32_t *me )

opal/util/sys_limits.c

@@ -33,6 +33,7 @@
 #include <sys/resource.h>
 #endif
 
+#include "opal/constants.h"
 #include "opal/mca/base/mca_base_param.h"
 
 #include "opal/util/sys_limits.h"

orte/mca/errmgr/default/errmgr_default_component.c

@@ -39,6 +39,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/errmgr/base/base.h"
 #include "orte/mca/errmgr/base/errmgr_private.h"
+#include "orte/util/proc_info.h"
 
 #include "errmgr_default.h"
 

orte/mca/ess/singleton/ess_singleton_module.c

@@ -20,6 +20,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

orte/mca/filem/base/filem_base_fns.c

@@ -16,6 +16,9 @@
 
 #include "orte_config.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

orte/mca/filem/base/filem_base_receive.c

@@ -24,9 +24,10 @@
  * includes
  */
 #include "orte_config.h"
-#include "orte/constants.h"
-#include "orte/types.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -42,6 +43,8 @@
 #include "opal/mca/base/mca_base_param.h"
 
 #include "opal/dss/dss.h"
+#include "orte/constants.h"
+#include "orte/types.h"
 #include "orte/util/proc_info.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/rml/rml.h"

orte/mca/filem/base/filem_base_select.c

@@ -15,6 +15,11 @@
  */
 
 #include "orte_config.h"
+
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "orte/constants.h"
 
 #include "opal/mca/mca.h"

orte/mca/filem/rsh/filem_rsh_module.c

@@ -19,8 +19,10 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -31,11 +33,11 @@
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-
-#include "opal/event/event.h"
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 
+#include "opal/event/event.h"
+
+#include "orte/constants.h"
 #include "orte/util/show_help.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"

orte/mca/iof/base/iof_base_open.c

@@ -20,6 +20,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdio.h>
 
 #include "opal/mca/mca.h"

orte/mca/iof/base/iof_base_output.c

@@ -26,6 +26,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

orte/mca/notifier/twitter/notifier_twitter_component.c

@@ -24,6 +24,10 @@
 
 #include "orte_config.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/mca/base/mca_base_param.h"
 
 #include "orte/constants.h"

orte/mca/odls/base/odls_base_state.c

@@ -21,6 +21,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif

orte/mca/odls/default/odls_default_module.c

@@ -24,6 +24,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

orte/mca/plm/base/plm_base_receive.c

@@ -24,9 +24,10 @@
  * includes
  */
 #include "orte_config.h"
-#include "orte/constants.h"
-#include "orte/types.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -36,6 +37,8 @@
 #include "opal/mca/base/mca_base_param.h"
 
 #include "opal/dss/dss.h"
+#include "orte/constants.h"
+#include "orte/types.h"
 #include "orte/util/proc_info.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/rml/rml.h"

orte/mca/plm/base/plm_base_rsh_support.c

@@ -22,6 +22,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

orte/mca/plm/slurm/plm_slurm_module.c

@@ -26,9 +26,10 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
-#include "orte/types.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -58,6 +59,8 @@
 #include "opal/util/basename.h"
 #include "opal/mca/base/mca_base_param.h"
 
+#include "orte/constants.h"
+#include "orte/types.h"
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"

orte/mca/plm/slurmd/plm_slurmd_module.c

@@ -26,9 +26,10 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
-#include "orte/types.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -58,6 +59,8 @@
 #include "opal/util/basename.h"
 #include "opal/mca/base/mca_base_param.h"
 
+#include "orte/constants.h"
+#include "orte/types.h"
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"

orte/mca/ras/base/ras_base_allocate.c

@@ -17,6 +17,11 @@
  */
 
 #include "orte_config.h"
+
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "orte/constants.h"
 #include "orte/types.h"
 

orte/mca/rml/base/rml_base_components.c

@@ -8,6 +8,10 @@
 
 #include "orte_config.h"
 
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "opal/mca/mca.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 #include "opal/util/output.h"

orte/mca/routed/base/base.h

@@ -15,6 +15,9 @@
 
 #include "opal/mca/mca.h"
 
+#include "opal/dss/dss_types.h"
+
+#include "orte/mca/rml/rml_types.h"
 #include "orte/mca/routed/routed.h"
 
 BEGIN_C_DECLS

orte/mca/routed/base/routed_base_components.c

@@ -12,6 +12,7 @@
  */
 
 #include "orte_config.h"
+#include "orte/constants.h"
 
 #include "opal/mca/mca.h"
 #include "opal/class/opal_bitmap.h"

orte/mca/snapc/base/snapc_base_fns.c

@@ -18,6 +18,9 @@
 
 #include "orte_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif  /* HAVE_SYS_TYPES_H */

orte/mca/snapc/base/snapc_base_open.c

@@ -17,8 +17,10 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -32,6 +34,7 @@
 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
 
+#include "orte/constants.h"
 #include "orte/mca/snapc/snapc.h"
 #include "orte/mca/snapc/base/base.h"
 

orte/mca/snapc/base/snapc_base_select.c

@@ -15,6 +15,11 @@
  */
 
 #include "orte_config.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "orte/constants.h"
 
 #include "opal/mca/mca.h"

orte/orted/orted_main.c

@@ -20,7 +20,10 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -58,6 +61,7 @@
 #include "opal/util/daemon_init.h"
 #include "opal/dss/dss.h"
 
+#include "orte/constants.h"
 #include "orte/util/show_help.h"
 #include "orte/util/proc_info.h"
 #include "orte/util/session_dir.h"

orte/runtime/data_type_support/orte_dt_copy_fns.c

@@ -18,7 +18,12 @@
 
 #include "orte_config.h"
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 #include "opal/util/argv.h"
 

orte/runtime/data_type_support/orte_dt_size_fns.c

@@ -15,14 +15,19 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
-#include "orte/types.h"
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 #include "opal/util/argv.h"
 
 #include "opal/dss/dss.h"
+#include "orte/constants.h"
+#include "orte/types.h"
 #include "orte/mca/plm/plm_types.h"
 #include "orte/mca/errmgr/errmgr.h"
 

orte/runtime/orte_wait.c

@@ -22,8 +22,10 @@
 
 
 #include "orte_config.h"
-#include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <assert.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -56,6 +58,7 @@
 #include "opal/threads/condition.h"
 #include "opal/sys/atomic.h"
 
+#include "orte/constants.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"

orte/tools/orte-iof/orte-iof.c

@@ -56,6 +56,7 @@
 #include <dirent.h>
 #endif  /* HAVE_DIRENT_H */
 
+#include "opal/event/event.h"
 #include "opal/util/cmd_line.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"

orte/tools/orterun/debuggers.c

@@ -92,6 +92,9 @@
  * hard-coded in the OMPI layer (see ompi/debuggers/ompi_debuggers.c).
  */
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>

orte/tools/orterun/orterun.c

@@ -24,7 +24,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
-
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

orte/util/dash_host/dash_host.c

@@ -17,6 +17,11 @@
  */
 
 #include "orte_config.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "orte/constants.h"
 #include "orte/types.h"
 

orte/util/pre_condition_transports.c

@@ -17,9 +17,10 @@
  */
 
 #include "orte_config.h"
-#include "orte/constants.h"
-#include "orte/types.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -41,6 +42,8 @@
 
 #include "opal/util/argv.h"
 
+#include "orte/constants.h"
+#include "orte/types.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/plm/plm_types.h"