From 4d92c9989ee86fe7b0ae6fb72b2f549d95bbbda2 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 24 Jun 2015 10:00:01 -0600 Subject: [PATCH] more c99 updates This commit does two things. It removes checks for C99 required headers (stdlib.h, string.h, signal.h, etc). Additionally it removes definitions for required C99 types (intptr_t, int64_t, int32_t, etc). Signed-off-by: Nathan Hjelm --- configure.ac | 15 +- ompi/attribute/attribute_predefined.c | 2 - ompi/datatype/ompi_datatype.h | 6 - ompi/datatype/ompi_datatype_create.c | 2 - ompi/debuggers/ompi_mpihandles_dll.c | 4 - ompi/debuggers/ompi_msgq_dll.c | 4 - ompi/errhandler/errcode.c | 2 - ompi/errhandler/errhandler.c | 2 - ompi/info/info.c | 4 - ompi/mca/coll/cuda/coll_cuda_module.c | 2 - ompi/mca/coll/ml/coll_ml_allocation.c | 2 - ompi/mca/coll/sm/coll_sm_bcast.c | 2 - ompi/mca/coll/sm/coll_sm_module.c | 2 - ompi/mca/coll/sm/coll_sm_reduce.c | 2 - ompi/mca/dpm/base/base.h | 2 - ompi/mca/dpm/base/dpm_base_null_fns.c | 2 - ompi/mca/dpm/dpm.h | 2 - ompi/mca/dpm/orte/dpm_orte.c | 2 - .../romio314/romio/adio/ad_xfs/ad_xfs_open.c | 2 - .../romio314/romio/adio/common/system_hints.c | 4 - ompi/mca/op/base/op_base_frame.c | 2 - ompi/mca/osc/osc.h | 2 - ompi/mca/pml/base/pml_base_frame.c | 2 - ompi/mca/pml/base/pml_base_select.c | 2 - ompi/mca/pml/v/pml_v_output.c | 2 - ompi/mca/topo/base/topo_base_cart_get.c | 2 - .../vprotocol/base/vprotocol_base_select.c | 2 - ompi/mpi/java/c/mpi_Intracomm.c | 2 - ompi/mpi/java/c/mpi_MPI.c | 4 - ompi/peruse/peruse.c | 2 - ompi/peruse/peruse_module.c | 2 - ompi/runtime/ompi_mpi_params.c | 4 - ompi/tools/ompi_info/ompi_info.c | 2 - opal/class/opal_hash_table.h | 2 - opal/class/opal_object.h | 2 - opal/datatype/opal_convertor.c | 3 - .../opal_copy_functions_heterogeneous.c | 2 - opal/datatype/opal_datatype_internal.h | 4 - opal/dss/dss_internal.h | 8 +- opal/include/opal/sys/atomic_impl.h | 2 - opal/include/opal/types.h | 2 - opal/include/opal_config_bottom.h | 7 - opal/include/opal_stdint.h | 241 +----------------- .../mca/allocator/base/allocator_base_frame.c | 2 - opal/mca/btl/self/btl_self.h | 2 - opal/mca/btl/self/btl_self_component.c | 2 - opal/mca/btl/sm/btl_sm.h | 2 - opal/mca/btl/sm/btl_sm_component.c | 2 - opal/mca/btl/smcuda/btl_smcuda.h | 2 - opal/mca/btl/smcuda/btl_smcuda_component.c | 2 - opal/mca/btl/tcp/btl_tcp_endpoint.c | 2 - opal/mca/btl/usnic/btl_usnic_mca.c | 2 - opal/mca/btl/vader/btl_vader.h | 2 - opal/mca/common/verbs/common_verbs_qp_type.c | 2 - opal/mca/crs/base/crs_base_fns.c | 2 - opal/mca/crs/none/crs_none_module.c | 2 - opal/mca/crs/self/crs_self_module.c | 2 - opal/mca/event/event.h | 4 - opal/mca/hwloc/hwloc.h | 4 - .../hwloc1110/hwloc/include/private/private.h | 2 - opal/mca/mpool/base/mpool_base_alloc.c | 4 - opal/mca/mpool/sm/mpool_sm_component.c | 2 - opal/mca/pmix/native/pmix_native.c | 2 - opal/mca/pstat/linux/pstat_linux_module.c | 2 - opal/mca/pstat/test/pstat_test.c | 2 - .../reachable/weighted/reachable_weighted.c | 2 - opal/mca/sec/basic/sec_basic.c | 2 - opal/mca/sec/keystone/sec_keystone.c | 2 - opal/mca/sec/munge/sec_munge.c | 2 - opal/mca/shmem/base/shmem_base_select.c | 2 - opal/mca/shmem/mmap/shmem_mmap_module.c | 4 - .../shmem/posix/shmem_posix_common_utils.c | 2 - opal/mca/shmem/posix/shmem_posix_component.c | 2 - opal/mca/shmem/posix/shmem_posix_module.c | 2 - opal/mca/shmem/shmem_types.h | 4 - opal/mca/shmem/sysv/shmem_sysv_component.c | 2 - opal/mca/shmem/sysv/shmem_sysv_module.c | 2 - opal/mca/timer/linux/timer_linux_component.c | 2 - opal/runtime/opal_cr.c | 4 - opal/runtime/opal_params.c | 2 - opal/threads/condition.h | 2 - opal/threads/threads.h | 2 - opal/tools/opal-checkpoint/opal-checkpoint.c | 6 - opal/tools/opal-restart/opal-restart.c | 4 - opal/tools/wrappers/opal_wrapper.c | 4 - opal/util/argv.c | 4 - opal/util/basename.c | 2 - opal/util/cmd_line.c | 2 - opal/util/crc.c | 4 - opal/util/error.c | 4 - opal/util/keyval_parse.c | 2 - opal/util/opal_getcwd.c | 2 - opal/util/opal_pty.c | 2 - opal/util/output.h | 2 - opal/util/stacktrace.c | 5 - opal/util/sys_limits.c | 2 - opal/util/timings.c | 2 - opal/win32/win_compat.h | 2 - orte/mca/dfs/app/dfs_app.c | 2 - orte/mca/dfs/base/dfs_base_frame.c | 2 - orte/mca/dfs/base/dfs_base_select.c | 2 - orte/mca/dfs/orted/dfs_orted.c | 2 - orte/mca/dfs/test/dfs_test.c | 2 - orte/mca/errmgr/base/errmgr_base_fns.c | 2 - orte/mca/errmgr/base/errmgr_base_frame.c | 2 - orte/mca/errmgr/base/errmgr_base_select.c | 2 - orte/mca/errmgr/base/errmgr_base_tool.c | 2 - .../errmgr/default_app/errmgr_default_app.c | 2 - .../errmgr/default_hnp/errmgr_default_hnp.c | 2 - .../default_orted/errmgr_default_orted.c | 2 - .../errmgr/default_tool/errmgr_default_tool.c | 2 - orte/mca/ess/lsf/ess_lsf_module.c | 2 - orte/mca/ess/pmi/ess_pmi_module.c | 2 - orte/mca/ess/singleton/ess_singleton_module.c | 2 - orte/mca/ess/slurm/ess_slurm_module.c | 2 - orte/mca/ess/tm/ess_tm_module.c | 2 - orte/mca/filem/base/filem_base_fns.c | 2 - orte/mca/filem/base/filem_base_receive.c | 2 - orte/mca/filem/base/filem_base_select.c | 2 - orte/mca/filem/raw/filem_raw_module.c | 2 - orte/mca/iof/base/base.h | 2 - orte/mca/iof/base/iof_base_frame.c | 2 - orte/mca/iof/base/iof_base_output.c | 4 - orte/mca/iof/hnp/iof_hnp.c | 2 - orte/mca/iof/hnp/iof_hnp_read.c | 2 - orte/mca/iof/hnp/iof_hnp_receive.c | 2 - orte/mca/iof/hnp/iof_hnp_send.c | 2 - orte/mca/iof/mr_hnp/iof_mrhnp.c | 2 - orte/mca/iof/mr_hnp/iof_mrhnp_read.c | 2 - orte/mca/iof/mr_hnp/iof_mrhnp_receive.c | 2 - orte/mca/iof/mr_orted/iof_mrorted.c | 2 - orte/mca/iof/mr_orted/iof_mrorted_read.c | 2 - orte/mca/iof/mr_orted/iof_mrorted_receive.c | 2 - orte/mca/iof/orted/iof_orted.c | 2 - orte/mca/iof/orted/iof_orted_read.c | 2 - orte/mca/iof/orted/iof_orted_receive.c | 2 - orte/mca/iof/tool/iof_tool.c | 2 - orte/mca/iof/tool/iof_tool_receive.c | 2 - orte/mca/notifier/base/notifier_base_frame.c | 2 - orte/mca/notifier/base/notifier_base_select.c | 2 - orte/mca/notifier/notifier.h | 4 - orte/mca/notifier/smtp/notifier_smtp_module.c | 4 - .../notifier/syslog/notifier_syslog_module.c | 2 - orte/mca/odls/alps/odls_alps_module.c | 6 - orte/mca/odls/base/odls_base_default_fns.c | 2 - orte/mca/odls/base/odls_base_frame.c | 2 - orte/mca/odls/default/odls_default_module.c | 6 - orte/mca/plm/alps/plm_alps_module.c | 4 - orte/mca/plm/base/plm_base_orted_cmds.c | 2 - orte/mca/plm/base/plm_base_receive.c | 2 - orte/mca/plm/lsf/plm_lsf_module.c | 2 - orte/mca/plm/rsh/plm_rsh.h | 2 - orte/mca/plm/rsh/plm_rsh_module.c | 2 - orte/mca/plm/slurm/plm_slurm_module.c | 4 - orte/mca/plm/tm/plm_tm_module.c | 2 - orte/mca/qos/base/qos_base_channel_handlers.c | 2 - orte/mca/qos/noop/qos_noop_channel_handlers.c | 2 - orte/mca/ras/base/ras_base_allocate.c | 2 - orte/mca/rmaps/base/rmaps_base_frame.c | 2 - orte/mca/rmaps/lama/rmaps_lama_module.c | 2 - orte/mca/rmaps/mindist/rmaps_mindist_module.c | 2 - orte/mca/rmaps/ppr/rmaps_ppr.c | 2 - orte/mca/rmaps/rank_file/rmaps_rank_file.c | 2 - .../rank_file/rmaps_rank_file_component.c | 2 - orte/mca/rmaps/resilient/rmaps_resilient.c | 2 - orte/mca/rmaps/round_robin/rmaps_rr.c | 2 - orte/mca/rmaps/seq/rmaps_seq.c | 2 - orte/mca/rmaps/staged/rmaps_staged.c | 2 - orte/mca/rml/base/rml_base_channel_handlers.c | 2 - orte/mca/rml/base/rml_base_frame.c | 2 - orte/mca/rml/base/rml_base_msg_handlers.c | 2 - orte/mca/rml/base/rml_base_receive.c | 2 - orte/mca/rtc/base/rtc_base_frame.c | 2 - orte/mca/rtc/freq/rtc_freq.c | 2 - orte/mca/rtc/hwloc/rtc_hwloc.c | 2 - orte/mca/schizo/base/schizo_base_frame.c | 2 - orte/mca/snapc/base/snapc_base_fns.c | 2 - orte/mca/snapc/base/snapc_base_frame.c | 2 - orte/mca/snapc/base/snapc_base_select.c | 2 - orte/mca/snapc/full/snapc_full_app.c | 4 - orte/mca/snapc/full/snapc_full_global.c | 2 - orte/mca/snapc/full/snapc_full_local.c | 4 - orte/mca/sstore/base/sstore_base_fns.c | 2 - orte/mca/sstore/base/sstore_base_select.c | 2 - orte/mca/sstore/central/sstore_central_app.c | 2 - .../sstore/central/sstore_central_global.c | 2 - .../mca/sstore/central/sstore_central_local.c | 2 - .../sstore/central/sstore_central_module.c | 2 - orte/mca/sstore/stage/sstore_stage_app.c | 2 - orte/mca/sstore/stage/sstore_stage_global.c | 2 - orte/mca/sstore/stage/sstore_stage_local.c | 2 - orte/mca/sstore/stage/sstore_stage_module.c | 2 - orte/mca/state/app/state_app.c | 2 - orte/mca/state/base/state_base_frame.c | 2 - orte/mca/state/base/state_base_select.c | 2 - orte/mca/state/dvm/state_dvm.c | 2 - orte/mca/state/hnp/state_hnp.c | 2 - orte/mca/state/novm/state_novm.c | 2 - orte/mca/state/orted/state_orted.c | 2 - orte/mca/state/staged_hnp/state_staged_hnp.c | 2 - .../state/staged_orted/state_staged_orted.c | 2 - orte/mca/state/tool/state_tool.c | 2 - orte/orted/orted.h | 2 - orte/orted/orted_comm.c | 2 - orte/orted/orted_main.c | 2 - .../data_type_support/orte_dt_compare_fns.c | 2 - .../data_type_support/orte_dt_copy_fns.c | 2 - orte/runtime/orte_data_server.c | 2 - orte/runtime/orte_quit.c | 2 - orte/runtime/orte_wait.c | 2 - orte/runtime/orte_wait.h | 2 - orte/tools/orte-checkpoint/orte-checkpoint.c | 4 - orte/tools/orte-clean/orte-clean.c | 4 - orte/tools/orte-dvm/orte-dvm.c | 4 - orte/tools/orte-info/orte-info.c | 2 - orte/tools/orte-info/output.c | 2 - orte/tools/orte-migrate/orte-migrate.c | 4 - orte/tools/orte-ps/orte-ps.c | 4 - orte/tools/orte-restart/orte-restart.c | 4 - orte/tools/orte-server/orte-server.c | 2 - orte/tools/orte-submit/orte-submit.c | 4 - orte/tools/orted/orted.c | 2 - orte/tools/orterun/orterun.c | 4 - orte/util/dash_host/dash_host.c | 2 - orte/util/error_strings.c | 2 - orte/util/pre_condition_transports.c | 4 - orte/util/proc_info.h | 2 - oshmem/mca/spml/base/spml_base_frame.c | 2 - oshmem/mca/spml/base/spml_base_select.c | 2 - oshmem/mca/sshmem/base/sshmem_base_select.c | 2 - oshmem/mca/sshmem/mmap/sshmem_mmap_module.c | 4 - .../mca/sshmem/sysv/sshmem_sysv_component.c | 2 - oshmem/mca/sshmem/sysv/sshmem_sysv_module.c | 2 - oshmem/mca/sshmem/verbs/sshmem_verbs_module.c | 4 - oshmem/tools/oshmem_info/oshmem_info.c | 2 - test/class/ompi_rb_tree.c | 2 - test/class/opal_hash_table.c | 2 - test/class/opal_proc_table.c | 2 - test/datatype/ddt_pack.c | 4 - test/datatype/opal_ddt_lib.c | 5 +- 240 files changed, 15 insertions(+), 825 deletions(-) diff --git a/configure.ac b/configure.ac index a46a7c6d1ed..528a676b33b 100644 --- a/configure.ac +++ b/configure.ac @@ -592,18 +592,17 @@ AC_CACHE_SAVE opal_show_title "Header file tests" AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h \ - dlfcn.h execinfo.h err.h fcntl.h grp.h inttypes.h libgen.h \ + dlfcn.h execinfo.h err.h fcntl.h grp.h libgen.h \ libutil.h memory.h netdb.h netinet/in.h netinet/tcp.h \ - poll.h pthread.h pty.h pwd.h sched.h stdint.h stddef.h \ - stdlib.h string.h strings.h stropts.h sys/fcntl.h sys/ipc.h sys/shm.h \ + poll.h pthread.h pty.h pwd.h sched.h \ + strings.h stropts.h sys/fcntl.h sys/ipc.h sys/shm.h \ sys/ioctl.h sys/mman.h sys/param.h sys/queue.h \ sys/resource.h sys/select.h sys/socket.h sys/sockio.h \ - stdarg.h sys/stat.h sys/statfs.h sys/statvfs.h sys/time.h sys/tree.h \ + sys/stat.h sys/statfs.h sys/statvfs.h sys/time.h sys/tree.h \ sys/types.h sys/uio.h sys/un.h net/uio.h sys/utsname.h sys/vfs.h sys/wait.h syslog.h \ - time.h termios.h ulimit.h unistd.h util.h utmp.h malloc.h \ - ifaddrs.h crt_externs.h regex.h signal.h \ - mntent.h paths.h \ - ioLib.h sockLib.h hostLib.h shlwapi.h sys/synch.h limits.h db.h ndbm.h]) + termios.h ulimit.h unistd.h util.h utmp.h malloc.h \ + ifaddrs.h crt_externs.h regex.h mntent.h paths.h \ + ioLib.h sockLib.h hostLib.h shlwapi.h sys/synch.h db.h ndbm.h]) AC_CHECK_HEADERS([sys/mount.h], [], [], [AC_INCLUDES_DEFAULT diff --git a/ompi/attribute/attribute_predefined.c b/ompi/attribute/attribute_predefined.c index 81f06bb0222..e9cdc1273e7 100644 --- a/ompi/attribute/attribute_predefined.c +++ b/ompi/attribute/attribute_predefined.c @@ -81,9 +81,7 @@ #include "ompi_config.h" -#ifdef HAVE_STDLIB_H #include -#endif #include "mpi.h" diff --git a/ompi/datatype/ompi_datatype.h b/ompi/datatype/ompi_datatype.h index 55aeaa9e6d2..c3c1a8b07fb 100644 --- a/ompi/datatype/ompi_datatype.h +++ b/ompi/datatype/ompi_datatype.h @@ -28,15 +28,9 @@ #include "ompi_config.h" #include -#ifdef HAVE_STDINT_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif -#ifdef HAVE_LIMITS_H #include -#endif #include "ompi/constants.h" #include "opal/datatype/opal_convertor.h" diff --git a/ompi/datatype/ompi_datatype_create.c b/ompi/datatype/ompi_datatype_create.c index b73eb781cab..d97d9c942ac 100644 --- a/ompi/datatype/ompi_datatype_create.c +++ b/ompi/datatype/ompi_datatype_create.c @@ -20,9 +20,7 @@ #include "ompi_config.h" #include -#ifdef HAVE_STRING_H #include -#endif #include "opal/class/opal_pointer_array.h" #include "ompi/datatype/ompi_datatype.h" diff --git a/ompi/debuggers/ompi_mpihandles_dll.c b/ompi/debuggers/ompi_mpihandles_dll.c index 8a9ab960cf8..e93a39564e3 100644 --- a/ompi/debuggers/ompi_mpihandles_dll.c +++ b/ompi/debuggers/ompi_mpihandles_dll.c @@ -36,12 +36,8 @@ #include "ompi_config.h" -#if defined(HAVE_STRING_H) #include -#endif /* defined(HAVE_STRING_H) */ -#if defined(HAVE_STDLIB_H) #include -#endif /* defined(HAVE_STDLIB_H) */ #include "ompi/mca/pml/base/pml_base_request.h" #include "mpihandles_interface.h" diff --git a/ompi/debuggers/ompi_msgq_dll.c b/ompi/debuggers/ompi_msgq_dll.c index 693a609f4e5..6e9a0d65595 100644 --- a/ompi/debuggers/ompi_msgq_dll.c +++ b/ompi/debuggers/ompi_msgq_dll.c @@ -71,12 +71,8 @@ #ifdef HAVE_NO_C_CONST #define const #endif -#if defined(HAVE_STRING_H) #include -#endif /* defined(HAVE_STRING_H) */ -#if defined(HAVE_STDLIB_H) #include -#endif /* defined(HAVE_STDLIB_H) */ /* Notice to developers!!!! * The following include files with _dbg.h suffixes contains definitions diff --git a/ompi/errhandler/errcode.c b/ompi/errhandler/errcode.c index b49f6e62520..ce48f626fe9 100644 --- a/ompi/errhandler/errcode.c +++ b/ompi/errhandler/errcode.c @@ -26,9 +26,7 @@ #include "ompi_config.h" #include -#ifdef HAVE_STRING_H #include -#endif #include "mpi.h" diff --git a/ompi/errhandler/errhandler.c b/ompi/errhandler/errhandler.c index f7c55acd9eb..d7fee7be54f 100644 --- a/ompi/errhandler/errhandler.c +++ b/ompi/errhandler/errhandler.c @@ -23,9 +23,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "ompi/communicator/communicator.h" #include "ompi/win/win.h" diff --git a/ompi/info/info.c b/ompi/info/info.c index 237bdd74a6e..85b5e9a772f 100644 --- a/ompi/info/info.c +++ b/ompi/info/info.c @@ -26,13 +26,9 @@ #include "ompi_config.h" #include "ompi/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/ompi/mca/coll/cuda/coll_cuda_module.c b/ompi/mca/coll/cuda/coll_cuda_module.c index 115e5652d49..6535cf5f09a 100644 --- a/ompi/mca/coll/cuda/coll_cuda_module.c +++ b/ompi/mca/coll/cuda/coll_cuda_module.c @@ -12,9 +12,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include "coll_cuda.h" diff --git a/ompi/mca/coll/ml/coll_ml_allocation.c b/ompi/mca/coll/ml/coll_ml_allocation.c index 555c5e9aff8..184a2051f65 100644 --- a/ompi/mca/coll/ml/coll_ml_allocation.c +++ b/ompi/mca/coll/ml/coll_ml_allocation.c @@ -11,9 +11,7 @@ #include "ompi_config.h" -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #include "coll_ml.h" #include "coll_ml_inlines.h" diff --git a/ompi/mca/coll/sm/coll_sm_bcast.c b/ompi/mca/coll/sm/coll_sm_bcast.c index 6c40a977ae9..754581ea160 100644 --- a/ompi/mca/coll/sm/coll_sm_bcast.c +++ b/ompi/mca/coll/sm/coll_sm_bcast.c @@ -19,9 +19,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/datatype/opal_convertor.h" #include "ompi/constants.h" diff --git a/ompi/mca/coll/sm/coll_sm_module.c b/ompi/mca/coll/sm/coll_sm_module.c index 1bd83f6ca37..80d04ea0973 100644 --- a/ompi/mca/coll/sm/coll_sm_module.c +++ b/ompi/mca/coll/sm/coll_sm_module.c @@ -34,9 +34,7 @@ #include "ompi_config.h" #include -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SCHED_H #include #endif diff --git a/ompi/mca/coll/sm/coll_sm_reduce.c b/ompi/mca/coll/sm/coll_sm_reduce.c index e6561a551b7..4d0f8668069 100644 --- a/ompi/mca/coll/sm/coll_sm_reduce.c +++ b/ompi/mca/coll/sm/coll_sm_reduce.c @@ -19,9 +19,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/datatype/opal_convertor.h" #include "opal/sys/atomic.h" diff --git a/ompi/mca/dpm/base/base.h b/ompi/mca/dpm/base/base.h index 7d9c2e37d0d..3e34a0b8a1f 100644 --- a/ompi/mca/dpm/base/base.h +++ b/ompi/mca/dpm/base/base.h @@ -25,9 +25,7 @@ #include "ompi_config.h" #include "ompi/constants.h" -#if HAVE_TIME_H #include -#endif #if HAVE_SYS_TIME_H #include #endif diff --git a/ompi/mca/dpm/base/dpm_base_null_fns.c b/ompi/mca/dpm/base/dpm_base_null_fns.c index b92f294f4e9..454bc6869d6 100644 --- a/ompi/mca/dpm/base/dpm_base_null_fns.c +++ b/ompi/mca/dpm/base/dpm_base_null_fns.c @@ -26,9 +26,7 @@ #include "ompi_config.h" #include #include -#if HAVE_TIME_H #include -#endif #if HAVE_SYS_TIME_H #include #endif diff --git a/ompi/mca/dpm/dpm.h b/ompi/mca/dpm/dpm.h index 4bb20a88820..2fc1acc00d5 100644 --- a/ompi/mca/dpm/dpm.h +++ b/ompi/mca/dpm/dpm.h @@ -31,9 +31,7 @@ #include "ompi_config.h" -#if HAVE_TIME_H #include -#endif #if HAVE_SYS_TIME_H #include #endif diff --git a/ompi/mca/dpm/orte/dpm_orte.c b/ompi/mca/dpm/orte/dpm_orte.c index 5da21be7eec..bc0aa2549aa 100644 --- a/ompi/mca/dpm/orte/dpm_orte.c +++ b/ompi/mca/dpm/orte/dpm_orte.c @@ -31,9 +31,7 @@ #include #include #include -#if HAVE_TIME_H #include -#endif #if HAVE_SYS_TIME_H #include #endif diff --git a/ompi/mca/io/romio314/romio/adio/ad_xfs/ad_xfs_open.c b/ompi/mca/io/romio314/romio/adio/ad_xfs/ad_xfs_open.c index 2fe3747d605..e0ccafe7f1b 100644 --- a/ompi/mca/io/romio314/romio/adio/ad_xfs/ad_xfs_open.c +++ b/ompi/mca/io/romio314/romio/adio/ad_xfs/ad_xfs_open.c @@ -9,9 +9,7 @@ #include "ad_xfs.h" #include -#ifdef HAVE_STDDEF_H #include -#endif #ifndef HAVE_LSEEK64 #define lseek64 lseek diff --git a/ompi/mca/io/romio314/romio/adio/common/system_hints.c b/ompi/mca/io/romio314/romio/adio/common/system_hints.c index 723152d3dba..56e9db21446 100644 --- a/ompi/mca/io/romio314/romio/adio/common/system_hints.c +++ b/ompi/mca/io/romio314/romio/adio/common/system_hints.c @@ -15,12 +15,8 @@ #ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef HAVE_STDLIB_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/ompi/mca/op/base/op_base_frame.c b/ompi/mca/op/base/op_base_frame.c index 72dcd088726..90167300851 100644 --- a/ompi/mca/op/base/op_base_frame.c +++ b/ompi/mca/op/base/op_base_frame.c @@ -20,9 +20,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" #include "ompi/mca/mca.h" diff --git a/ompi/mca/osc/osc.h b/ompi/mca/osc/osc.h index bfe9fd4d7f7..03145286c4a 100644 --- a/ompi/mca/osc/osc.h +++ b/ompi/mca/osc/osc.h @@ -32,9 +32,7 @@ #include "opal_config.h" -#ifdef HAVE_STDDEF_H #include -#endif #include "ompi/mca/mca.h" diff --git a/ompi/mca/pml/base/pml_base_frame.c b/ompi/mca/pml/base/pml_base_frame.c index fd5614a06c9..64f82224a25 100644 --- a/ompi/mca/pml/base/pml_base_frame.c +++ b/ompi/mca/pml/base/pml_base_frame.c @@ -26,9 +26,7 @@ #include "ompi_config.h" #include -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNIST_H */ diff --git a/ompi/mca/pml/base/pml_base_select.c b/ompi/mca/pml/base/pml_base_select.c index 62717bf4740..b046cf42229 100644 --- a/ompi/mca/pml/base/pml_base_select.c +++ b/ompi/mca/pml/base/pml_base_select.c @@ -23,9 +23,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/class/opal_list.h" #include "opal/util/output.h" diff --git a/ompi/mca/pml/v/pml_v_output.c b/ompi/mca/pml/v/pml_v_output.c index 13595daa88e..e33ac9bdb99 100644 --- a/ompi/mca/pml/v/pml_v_output.c +++ b/ompi/mca/pml/v/pml_v_output.c @@ -17,9 +17,7 @@ #if defined(HAVE_UNISTD_H) #include #endif -#if defined(HAVE_STRING_H) #include -#endif int pml_v_output_open(char *output, int verbosity) { opal_output_stream_t lds; diff --git a/ompi/mca/topo/base/topo_base_cart_get.c b/ompi/mca/topo/base/topo_base_cart_get.c index 0f184abc1b9..f0c143c8ed3 100644 --- a/ompi/mca/topo/base/topo_base_cart_get.c +++ b/ompi/mca/topo/base/topo_base_cart_get.c @@ -20,9 +20,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/vprotocol/base/vprotocol_base_select.c b/ompi/mca/vprotocol/base/vprotocol_base_select.c index 84abac9ec46..47e8ea6190d 100644 --- a/ompi/mca/vprotocol/base/vprotocol_base_select.c +++ b/ompi/mca/vprotocol/base/vprotocol_base_select.c @@ -13,9 +13,7 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "base.h" #include "ompi/mca/mca.h" diff --git a/ompi/mpi/java/c/mpi_Intracomm.c b/ompi/mpi/java/c/mpi_Intracomm.c index c7539adbfb4..6eab6cbbf0d 100644 --- a/ompi/mpi/java/c/mpi_Intracomm.c +++ b/ompi/mpi/java/c/mpi_Intracomm.c @@ -47,9 +47,7 @@ #include "ompi_config.h" #include -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_TARGETCONDITIONALS_H #include #endif diff --git a/ompi/mpi/java/c/mpi_MPI.c b/ompi/mpi/java/c/mpi_MPI.c index 23af0b37a35..f0fe93eca3f 100644 --- a/ompi/mpi/java/c/mpi_MPI.c +++ b/ompi/mpi/java/c/mpi_MPI.c @@ -54,12 +54,8 @@ #ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef HAVE_STDLIB_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_TARGETCONDITIONALS_H #include #endif diff --git a/ompi/peruse/peruse.c b/ompi/peruse/peruse.c index a33e00eaf49..ef9680b79a6 100644 --- a/ompi/peruse/peruse.c +++ b/ompi/peruse/peruse.c @@ -12,9 +12,7 @@ */ #include "ompi_config.h" -#ifdef HAVE_STRING_H # include -#endif #include "mpi.h" #include "ompi/peruse/peruse.h" #include "ompi/peruse/peruse-internal.h" diff --git a/ompi/peruse/peruse_module.c b/ompi/peruse/peruse_module.c index eb0df8492ab..5f19168700f 100644 --- a/ompi/peruse/peruse_module.c +++ b/ompi/peruse/peruse_module.c @@ -13,9 +13,7 @@ */ #include "ompi_config.h" -#ifdef HAVE_STDLIB_H # include -#endif #include "mpi.h" #include "ompi/peruse/peruse.h" #include "ompi/peruse/peruse-internal.h" diff --git a/ompi/runtime/ompi_mpi_params.c b/ompi/runtime/ompi_mpi_params.c index 413d8085a85..021bf9b617f 100644 --- a/ompi/runtime/ompi_mpi_params.c +++ b/ompi/runtime/ompi_mpi_params.c @@ -24,12 +24,8 @@ #include "ompi_config.h" -#ifdef HAVE_STRING_H #include -#endif -#ifdef HAVE_TIME_H #include -#endif /* HAVE_TIME_H */ #include "ompi/constants.h" #include "ompi/datatype/ompi_datatype.h" diff --git a/ompi/tools/ompi_info/ompi_info.c b/ompi/tools/ompi_info/ompi_info.c index 15e5431bb1b..4cd449d6c32 100644 --- a/ompi/tools/ompi_info/ompi_info.c +++ b/ompi/tools/ompi_info/ompi_info.c @@ -36,9 +36,7 @@ #include #endif #include -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/version.h" #include "opal/mca/installdirs/installdirs.h" diff --git a/opal/class/opal_hash_table.h b/opal/class/opal_hash_table.h index b0e0f5247f1..c621883f238 100644 --- a/opal/class/opal_hash_table.h +++ b/opal/class/opal_hash_table.h @@ -37,9 +37,7 @@ #include "opal_config.h" -#ifdef HAVE_STDINT_H #include -#endif #include "opal/class/opal_list.h" #include "opal/util/proc.h" diff --git a/opal/class/opal_object.h b/opal/class/opal_object.h index 02d9b17ada7..e8fe51966da 100644 --- a/opal/class/opal_object.h +++ b/opal/class/opal_object.h @@ -116,9 +116,7 @@ #include "opal_config.h" #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #include "opal/sys/atomic.h" diff --git a/opal/datatype/opal_convertor.c b/opal/datatype/opal_convertor.c index 10c8a4736ef..1c10efd1aa8 100644 --- a/opal/datatype/opal_convertor.c +++ b/opal/datatype/opal_convertor.c @@ -25,10 +25,7 @@ #include #include - -#ifdef HAVE_STDINT_H #include -#endif #include "opal/prefetch.h" #include "opal/util/arch.h" diff --git a/opal/datatype/opal_copy_functions_heterogeneous.c b/opal/datatype/opal_copy_functions_heterogeneous.c index 3cefc2cf147..8ff6d1644d1 100644 --- a/opal/datatype/opal_copy_functions_heterogeneous.c +++ b/opal/datatype/opal_copy_functions_heterogeneous.c @@ -16,9 +16,7 @@ #include "opal_config.h" #include -#ifdef HAVE_STDINT_H #include -#endif #include "opal/util/arch.h" diff --git a/opal/datatype/opal_datatype_internal.h b/opal/datatype/opal_datatype_internal.h index 33389deabc0..cc1352776ac 100644 --- a/opal/datatype/opal_datatype_internal.h +++ b/opal/datatype/opal_datatype_internal.h @@ -26,12 +26,8 @@ #include "opal_config.h" -#ifdef HAVE_STDARG_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif #if defined(VERBOSE) #include "opal/util/output.h" diff --git a/opal/dss/dss_internal.h b/opal/dss/dss_internal.h index e1657e260f4..e9152f7199b 100644 --- a/opal/dss/dss_internal.h +++ b/opal/dss/dss_internal.h @@ -36,12 +36,10 @@ #include "opal/dss/dss.h" #include "opal/util/proc.h" -#ifdef HAVE_STRING_H -# if !defined(STDC_HEADERS) && HAVE_MEMORY_H -# include -# endif -# include +#if !defined(STDC_HEADERS) && HAVE_MEMORY_H +# include #endif +#include BEGIN_C_DECLS diff --git a/opal/include/opal/sys/atomic_impl.h b/opal/include/opal/sys/atomic_impl.h index 97e93d7ce3b..e2da78e9604 100644 --- a/opal/include/opal/sys/atomic_impl.h +++ b/opal/include/opal/sys/atomic_impl.h @@ -22,9 +22,7 @@ /* Inline C implementation of the functions defined in atomic.h */ -#ifdef HAVE_STDLIB_H #include -#endif /********************************************************************** * diff --git a/opal/include/opal/types.h b/opal/include/opal/types.h index 60f9101ae1b..2089057365a 100644 --- a/opal/include/opal/types.h +++ b/opal/include/opal/types.h @@ -22,9 +22,7 @@ #include "opal_config.h" -#ifdef HAVE_STDINT_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/opal/include/opal_config_bottom.h b/opal/include/opal_config_bottom.h index 87d8d54ee89..dcc941a1b42 100644 --- a/opal/include/opal_config_bottom.h +++ b/opal/include/opal_config_bottom.h @@ -241,10 +241,6 @@ # define OPAL_MODULE_DECLSPEC # endif -/* - * Do we have ? - */ -#ifdef HAVE_STDINT_H #if !defined(__STDC_LIMIT_MACROS) && (defined(c_plusplus) || defined (__cplusplus)) /* When using a C++ compiler, the max / min value #defines for std types are only included if __STDC_LIMIT_MACROS is set before @@ -252,10 +248,7 @@ #define __STDC_LIMIT_MACROS #endif #include "opal_config.h" -#include -#else #include "opal_stdint.h" -#endif /*********************************************************************** * diff --git a/opal/include/opal_stdint.h b/opal/include/opal_stdint.h index 243b47bc17e..cd189627705 100644 --- a/opal/include/opal_stdint.h +++ b/opal/include/opal_stdint.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,113 +30,12 @@ * Include what we can and define what is missing. */ #include +#include #ifdef HAVE_SYS_TYPES_H #include #endif -/* 8-bit */ - -#if SIZEOF_CHAR == 1 - -#ifndef HAVE_INT8_T -typedef signed char int8_t; -#endif - -#ifndef HAVE_UINT8_T -typedef unsigned char uint8_t; -#endif - -#else - -#error Failed to define 8-bit types - -#endif - -/* 16-bit */ - -#if SIZEOF_SHORT == 2 - -#ifndef HAVE_INT16_T -typedef signed short int16_t; -#endif - -#ifndef HAVE_UINT16_T -typedef unsigned short uint16_t; -#endif - -#else - -#error Failed to define 16-bit types - -#endif - -/* 32-bit */ - -#if SIZEOF_INT == 4 - -#ifndef HAVE_INT32_T -typedef signed int int32_t; -#endif - -#ifndef HAVE_UINT32_T -typedef unsigned int uint32_t; -#endif - -#elif SIZEOF_LONG == 4 - -#ifndef HAVE_INT32_T -typedef signed long int32_t; -#endif - -#ifndef HAVE_UINT32_T -typedef unsigned long uint32_t; -#endif - -#else - -#error Failed to define 32-bit types - -#endif - -/* 64-bit */ - -#if SIZEOF_INT == 8 - -#ifndef HAVE_INT64_T -typedef signed int int64_t; -#endif - -#ifndef HAVE_UINT64_T -typedef unsigned int uint64_t; -#endif - -#elif SIZEOF_LONG == 8 - -#ifndef HAVE_INT64_T -typedef signed long int64_t; -#endif - -#ifndef HAVE_UINT64_T -typedef unsigned long uint64_t; -#endif - -#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 - -#ifndef HAVE_INT64_T -typedef signed long long int64_t; -#endif - -#ifndef HAVE_UINT64_T -typedef unsigned long long uint64_t; -#endif - -#else - -#error Failed to define 64-bit types - -#endif - /* 128-bit */ #ifdef HAVE_INT128_T @@ -204,143 +106,8 @@ typedef unsigned long long uintptr_t; #endif -/* fix up some constants that may be missing */ -#ifndef SIZE_MAX -# if SIZEOF_VOID_P == SIZEOF_INT -# define SIZE_MAX UINT_MAX -# elif SIZEOF_VOID_P == SIZEOF_LONG -# define SIZE_MAX ULONG_MAX -# else -# error Failed to find value for SIZE_MAX -# endif -#endif /* ifndef SIZE_MAX */ - - /* inttypes.h printf specifiers */ -#ifdef HAVE_INTTYPES_H # include -#else - -# if SIZEOF_LONG == 8 -# define __PRI64_PREFIX "l" -# define __PRIPTR_PREFIX "l" -# else -# define __PRI64_PREFIX "ll" -# define __PRIPTR_PREFIX -# endif - -/* Decimal notation. */ -# define PRId8 "d" -# define PRId16 "d" -# define PRId32 "d" -# define PRId64 __PRI64_PREFIX "d" - -# define PRIdLEAST8 "d" -# define PRIdLEAST16 "d" -# define PRIdLEAST32 "d" -# define PRIdLEAST64 __PRI64_PREFIX "d" - -# define PRIdFAST8 "d" -# define PRIdFAST16 __PRIPTR_PREFIX "d" -# define PRIdFAST32 __PRIPTR_PREFIX "d" -# define PRIdFAST64 __PRI64_PREFIX "d" - -# define PRIi8 "i" -# define PRIi16 "i" -# define PRIi32 "i" -# define PRIi64 __PRI64_PREFIX "i" - -# define PRIiLEAST8 "i" -# define PRIiLEAST16 "i" -# define PRIiLEAST32 "i" -# define PRIiLEAST64 __PRI64_PREFIX "i" - -# define PRIiFAST8 "i" -# define PRIiFAST16 __PRIPTR_PREFIX "i" -# define PRIiFAST32 __PRIPTR_PREFIX "i" -# define PRIiFAST64 __PRI64_PREFIX "i" - -/* Octal notation. */ -# define PRIo8 "o" -# define PRIo16 "o" -# define PRIo32 "o" -# define PRIo64 __PRI64_PREFIX "o" - -# define PRIoLEAST8 "o" -# define PRIoLEAST16 "o" -# define PRIoLEAST32 "o" -# define PRIoLEAST64 __PRI64_PREFIX "o" - -# define PRIoFAST8 "o" -# define PRIoFAST16 __PRIPTR_PREFIX "o" -# define PRIoFAST32 __PRIPTR_PREFIX "o" -# define PRIoFAST64 __PRI64_PREFIX "o" - -/* Unsigned integers. */ -# define PRIu8 "u" -# define PRIu16 "u" -# define PRIu32 "u" -# define PRIu64 __PRI64_PREFIX "u" - -# define PRIuLEAST8 "u" -# define PRIuLEAST16 "u" -# define PRIuLEAST32 "u" -# define PRIuLEAST64 __PRI64_PREFIX "u" - -# define PRIuFAST8 "u" -# define PRIuFAST16 __PRIPTR_PREFIX "u" -# define PRIuFAST32 __PRIPTR_PREFIX "u" -# define PRIuFAST64 __PRI64_PREFIX "u" - -/* lowercase hexadecimal notation. */ -# define PRIx8 "x" -# define PRIx16 "x" -# define PRIx32 "x" -# define PRIx64 __PRI64_PREFIX "x" - -# define PRIxLEAST8 "x" -# define PRIxLEAST16 "x" -# define PRIxLEAST32 "x" -# define PRIxLEAST64 __PRI64_PREFIX "x" - -# define PRIxFAST8 "x" -# define PRIxFAST16 __PRIPTR_PREFIX "x" -# define PRIxFAST32 __PRIPTR_PREFIX "x" -# define PRIxFAST64 __PRI64_PREFIX "x" - -/* UPPERCASE hexadecimal notation. */ -# define PRIX8 "X" -# define PRIX16 "X" -# define PRIX32 "X" -# define PRIX64 __PRI64_PREFIX "X" - -# define PRIXLEAST8 "X" -# define PRIXLEAST16 "X" -# define PRIXLEAST32 "X" -# define PRIXLEAST64 __PRI64_PREFIX "X" - -# define PRIXFAST8 "X" -# define PRIXFAST16 __PRIPTR_PREFIX "X" -# define PRIXFAST32 __PRIPTR_PREFIX "X" -# define PRIXFAST64 __PRI64_PREFIX "X" - -/* Macros for printing `intmax_t' and `uintmax_t'. */ -# define PRIdMAX __PRI64_PREFIX "d" -# define PRIiMAX __PRI64_PREFIX "i" -# define PRIoMAX __PRI64_PREFIX "o" -# define PRIuMAX __PRI64_PREFIX "u" -# define PRIxMAX __PRI64_PREFIX "x" -# define PRIXMAX __PRI64_PREFIX "X" - -/* Macros for printing `intptr_t' and `uintptr_t'. */ -# define PRIdPTR __PRIPTR_PREFIX "d" -# define PRIiPTR __PRIPTR_PREFIX "i" -# define PRIoPTR __PRIPTR_PREFIX "o" -# define PRIuPTR __PRIPTR_PREFIX "u" -# define PRIxPTR __PRIPTR_PREFIX "x" -# define PRIXPTR __PRIPTR_PREFIX "X" - -#endif #ifndef PRIsize_t # if defined(ACCEPT_C99) diff --git a/opal/mca/allocator/base/allocator_base_frame.c b/opal/mca/allocator/base/allocator_base_frame.c index 8742099f275..cf8559af2af 100644 --- a/opal/mca/allocator/base/allocator_base_frame.c +++ b/opal/mca/allocator/base/allocator_base_frame.c @@ -19,9 +19,7 @@ #include "opal_config.h" #include -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/opal/mca/btl/self/btl_self.h b/opal/mca/btl/self/btl_self.h index ddf11a601a6..7b4d9a956de 100644 --- a/opal/mca/btl/self/btl_self.h +++ b/opal/mca/btl/self/btl_self.h @@ -26,9 +26,7 @@ #include "opal_config.h" -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ diff --git a/opal/mca/btl/self/btl_self_component.c b/opal/mca/btl/self/btl_self_component.c index 6cff4eeb1e7..78e400ea6ef 100644 --- a/opal/mca/btl/self/btl_self_component.c +++ b/opal/mca/btl/self/btl_self_component.c @@ -23,9 +23,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ diff --git a/opal/mca/btl/sm/btl_sm.h b/opal/mca/btl/sm/btl_sm.h index e9fa5d24aa1..d3d2606b9a9 100644 --- a/opal/mca/btl/sm/btl_sm.h +++ b/opal/mca/btl/sm/btl_sm.h @@ -31,9 +31,7 @@ #include #include #include -#ifdef HAVE_STDINT_H #include -#endif /* HAVE_STDINT_H */ #ifdef HAVE_SCHED_H #include #endif /* HAVE_SCHED_H */ diff --git a/opal/mca/btl/sm/btl_sm_component.c b/opal/mca/btl/sm/btl_sm_component.c index cd8919bd349..5dee6205848 100644 --- a/opal/mca/btl/sm/btl_sm_component.c +++ b/opal/mca/btl/sm/btl_sm_component.c @@ -30,9 +30,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include #endif /* HAVE_FCNTL_H */ diff --git a/opal/mca/btl/smcuda/btl_smcuda.h b/opal/mca/btl/smcuda/btl_smcuda.h index b2c6a903008..7c9d30faded 100644 --- a/opal/mca/btl/smcuda/btl_smcuda.h +++ b/opal/mca/btl/smcuda/btl_smcuda.h @@ -31,9 +31,7 @@ #include #include #include -#ifdef HAVE_STDINT_H #include -#endif /* HAVE_STDINT_H */ #ifdef HAVE_SCHED_H #include #endif /* HAVE_SCHED_H */ diff --git a/opal/mca/btl/smcuda/btl_smcuda_component.c b/opal/mca/btl/smcuda/btl_smcuda_component.c index b84930d517b..f9639f13d30 100644 --- a/opal/mca/btl/smcuda/btl_smcuda_component.c +++ b/opal/mca/btl/smcuda/btl_smcuda_component.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include #endif /* HAVE_FCNTL_H */ diff --git a/opal/mca/btl/tcp/btl_tcp_endpoint.c b/opal/mca/btl/tcp/btl_tcp_endpoint.c index e2676ef40ef..a6a284c3c1b 100644 --- a/opal/mca/btl/tcp/btl_tcp_endpoint.c +++ b/opal/mca/btl/tcp/btl_tcp_endpoint.c @@ -48,9 +48,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif /* HAVE_SYS_TIME_H */ -#ifdef HAVE_TIME_H #include -#endif /* HAVE_TIME_H */ #include "opal/mca/event/event.h" #include "opal/util/net.h" diff --git a/opal/mca/btl/usnic/btl_usnic_mca.c b/opal/mca/btl/usnic/btl_usnic_mca.c index 087951c235d..fcdc1a1d086 100644 --- a/opal/mca/btl/usnic/btl_usnic_mca.c +++ b/opal/mca/btl/usnic/btl_usnic_mca.c @@ -23,9 +23,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include "opal/mca/base/mca_base_var.h" diff --git a/opal/mca/btl/vader/btl_vader.h b/opal/mca/btl/vader/btl_vader.h index bbaaf7eb6cf..12ce6351f8b 100644 --- a/opal/mca/btl/vader/btl_vader.h +++ b/opal/mca/btl/vader/btl_vader.h @@ -32,9 +32,7 @@ #include #include -#ifdef HAVE_STDINT_H # include -#endif /* HAVE_STDINT_H */ #ifdef HAVE_SCHED_H # include #endif /* HAVE_SCHED_H */ diff --git a/opal/mca/common/verbs/common_verbs_qp_type.c b/opal/mca/common/verbs/common_verbs_qp_type.c index 8063e219771..9f5b6a70871 100644 --- a/opal/mca/common/verbs/common_verbs_qp_type.c +++ b/opal/mca/common/verbs/common_verbs_qp_type.c @@ -12,9 +12,7 @@ #include "opal/constants.h" #include -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #include "common_verbs.h" diff --git a/opal/mca/crs/base/crs_base_fns.c b/opal/mca/crs/base/crs_base_fns.c index 7e8f06b43ef..923184e017d 100644 --- a/opal/mca/crs/base/crs_base_fns.c +++ b/opal/mca/crs/base/crs_base_fns.c @@ -23,9 +23,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/opal/mca/crs/none/crs_none_module.c b/opal/mca/crs/none/crs_none_module.c index ee71d6a2c62..fba3f1d332a 100644 --- a/opal/mca/crs/none/crs_none_module.c +++ b/opal/mca/crs/none/crs_none_module.c @@ -15,9 +15,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include diff --git a/opal/mca/crs/self/crs_self_module.c b/opal/mca/crs/self/crs_self_module.c index c3a71fe8c78..7c6d66f49fb 100644 --- a/opal/mca/crs/self/crs_self_module.c +++ b/opal/mca/crs/self/crs_self_module.c @@ -24,9 +24,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_DLFCN_H #include #endif diff --git a/opal/mca/event/event.h b/opal/mca/event/event.h index 569e424e499..cc81bb95068 100644 --- a/opal/mca/event/event.h +++ b/opal/mca/event/event.h @@ -22,12 +22,8 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_STDINT_H #include -#endif -#ifdef HAVE_STDARG_H #include -#endif #include "opal/class/opal_pointer_array.h" diff --git a/opal/mca/hwloc/hwloc.h b/opal/mca/hwloc/hwloc.h index 6d32ec5d0dc..e18b33a6584 100644 --- a/opal/mca/hwloc/hwloc.h +++ b/opal/mca/hwloc/hwloc.h @@ -21,12 +21,8 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_STDINT_H #include -#endif -#ifdef HAVE_STDARG_H #include -#endif #include "opal/class/opal_list.h" #include "opal/class/opal_value_array.h" diff --git a/opal/mca/hwloc/hwloc1110/hwloc/include/private/private.h b/opal/mca/hwloc/hwloc1110/hwloc/include/private/private.h index 0d592986ddc..441f5cadc21 100644 --- a/opal/mca/hwloc/hwloc1110/hwloc/include/private/private.h +++ b/opal/mca/hwloc/hwloc1110/hwloc/include/private/private.h @@ -31,9 +31,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STDINT_H #include -#endif #ifdef HAVE_SYS_UTSNAME_H #include #endif diff --git a/opal/mca/mpool/base/mpool_base_alloc.c b/opal/mca/mpool/base/mpool_base_alloc.c index 61699e0119b..d72b0b8d98d 100644 --- a/opal/mca/mpool/base/mpool_base_alloc.c +++ b/opal/mca/mpool/base/mpool_base_alloc.c @@ -22,12 +22,8 @@ */ #include "opal_config.h" -#ifdef HAVE_STDINT_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/mpool/mpool.h" #include "base.h" #include "mpool_base_tree.h" diff --git a/opal/mca/mpool/sm/mpool_sm_component.c b/opal/mca/mpool/sm/mpool_sm_component.c index 6d046a35a7f..bee668b4008 100644 --- a/opal/mca/mpool/sm/mpool_sm_component.c +++ b/opal/mca/mpool/sm/mpool_sm_component.c @@ -26,9 +26,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H*/ -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #include #include "opal/mca/base/base.h" diff --git a/opal/mca/pmix/native/pmix_native.c b/opal/mca/pmix/native/pmix_native.c index 8a7ca77e845..cd5e704918c 100644 --- a/opal/mca/pmix/native/pmix_native.c +++ b/opal/mca/pmix/native/pmix_native.c @@ -18,9 +18,7 @@ #include "opal/constants.h" #include "opal/types.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/opal/mca/pstat/linux/pstat_linux_module.c b/opal/mca/pstat/linux/pstat_linux_module.c index a3a6f326411..0ae3da6a33e 100644 --- a/opal/mca/pstat/linux/pstat_linux_module.c +++ b/opal/mca/pstat/linux/pstat_linux_module.c @@ -34,9 +34,7 @@ #include #include #include -#ifdef HAVE_TIME_H #include -#endif #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/opal/mca/pstat/test/pstat_test.c b/opal/mca/pstat/test/pstat_test.c index c9e0465e445..22da5f058cf 100644 --- a/opal/mca/pstat/test/pstat_test.c +++ b/opal/mca/pstat/test/pstat_test.c @@ -25,9 +25,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/opal/mca/reachable/weighted/reachable_weighted.c b/opal/mca/reachable/weighted/reachable_weighted.c index ccc41bb58bd..6996a61981d 100644 --- a/opal/mca/reachable/weighted/reachable_weighted.c +++ b/opal/mca/reachable/weighted/reachable_weighted.c @@ -16,9 +16,7 @@ #include "opal/constants.h" #include "opal/types.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/opal/mca/sec/basic/sec_basic.c b/opal/mca/sec/basic/sec_basic.c index db82b222bc9..a896ad2653b 100644 --- a/opal/mca/sec/basic/sec_basic.c +++ b/opal/mca/sec/basic/sec_basic.c @@ -11,9 +11,7 @@ #include "opal_config.h" #include "opal/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal_stdint.h" #include "opal/dss/dss_types.h" diff --git a/opal/mca/sec/keystone/sec_keystone.c b/opal/mca/sec/keystone/sec_keystone.c index 709fef2f1fa..3642f85cd59 100644 --- a/opal/mca/sec/keystone/sec_keystone.c +++ b/opal/mca/sec/keystone/sec_keystone.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #include diff --git a/opal/mca/sec/munge/sec_munge.c b/opal/mca/sec/munge/sec_munge.c index 703539d26d0..7ebfa0bc1e5 100644 --- a/opal/mca/sec/munge/sec_munge.c +++ b/opal/mca/sec/munge/sec_munge.c @@ -13,9 +13,7 @@ #include "opal_config.h" #include "opal/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #include "opal_stdint.h" diff --git a/opal/mca/shmem/base/shmem_base_select.c b/opal/mca/shmem/base/shmem_base_select.c index 02cd97dcaa1..766f0321968 100644 --- a/opal/mca/shmem/base/shmem_base_select.c +++ b/opal/mca/shmem/base/shmem_base_select.c @@ -21,9 +21,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/constants.h" #include "opal/util/output.h" diff --git a/opal/mca/shmem/mmap/shmem_mmap_module.c b/opal/mca/shmem/mmap/shmem_mmap_module.c index 031d0c9f4de..8e52890070e 100644 --- a/opal/mca/shmem/mmap/shmem_mmap_module.c +++ b/opal/mca/shmem/mmap/shmem_mmap_module.c @@ -37,15 +37,11 @@ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ -#ifdef HAVE_TIME_H #include -#endif /* HAVE_NETDB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ diff --git a/opal/mca/shmem/posix/shmem_posix_common_utils.c b/opal/mca/shmem/posix/shmem_posix_common_utils.c index cb9b6f0f5e1..58517aff49f 100644 --- a/opal/mca/shmem/posix/shmem_posix_common_utils.c +++ b/opal/mca/shmem/posix/shmem_posix_common_utils.c @@ -29,9 +29,7 @@ #ifdef HAVE_FCNTL_H #include #endif /* HAVE_FCNTL_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #if OPAL_HAVE_SOLARIS && !defined(_POSIX_C_SOURCE) #define _POSIX_C_SOURCE 200112L /* Required for shm_{open,unlink} decls */ #include diff --git a/opal/mca/shmem/posix/shmem_posix_component.c b/opal/mca/shmem/posix/shmem_posix_component.c index 7f78b9eb45d..e12560bdefa 100644 --- a/opal/mca/shmem/posix/shmem_posix_component.c +++ b/opal/mca/shmem/posix/shmem_posix_component.c @@ -31,9 +31,7 @@ #include -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_SYS_MMAN_H #include #endif /* HAVE_SYS_MMAN_H */ diff --git a/opal/mca/shmem/posix/shmem_posix_module.c b/opal/mca/shmem/posix/shmem_posix_module.c index 110c83320c3..d441b635b90 100644 --- a/opal/mca/shmem/posix/shmem_posix_module.c +++ b/opal/mca/shmem/posix/shmem_posix_module.c @@ -42,9 +42,7 @@ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ diff --git a/opal/mca/shmem/shmem_types.h b/opal/mca/shmem/shmem_types.h index ee7f9b202d4..f9092911bd1 100644 --- a/opal/mca/shmem/shmem_types.h +++ b/opal/mca/shmem/shmem_types.h @@ -33,12 +33,8 @@ #include "opal_config.h" -#ifdef HAVE_STDDEF_H #include -#endif /* HAVE_STDDEF_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ BEGIN_C_DECLS diff --git a/opal/mca/shmem/sysv/shmem_sysv_component.c b/opal/mca/shmem/sysv/shmem_sysv_component.c index 6875c01259f..6d4a2b7cf1d 100644 --- a/opal/mca/shmem/sysv/shmem_sysv_component.c +++ b/opal/mca/shmem/sysv/shmem_sysv_component.c @@ -34,9 +34,7 @@ #ifdef HAVE_SYS_MMAN_H #include #endif /* HAVE_SYS_MMAN_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/opal/mca/shmem/sysv/shmem_sysv_module.c b/opal/mca/shmem/sysv/shmem_sysv_module.c index 5e9ce76c347..0ab88dc4641 100644 --- a/opal/mca/shmem/sysv/shmem_sysv_module.c +++ b/opal/mca/shmem/sysv/shmem_sysv_module.c @@ -45,9 +45,7 @@ #if HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ diff --git a/opal/mca/timer/linux/timer_linux_component.c b/opal/mca/timer/linux/timer_linux_component.c index 289675ff059..9ebc479bca0 100644 --- a/opal/mca/timer/linux/timer_linux_component.c +++ b/opal/mca/timer/linux/timer_linux_component.c @@ -24,9 +24,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/mca/timer/timer.h" #include "opal/mca/timer/base/base.h" diff --git a/opal/runtime/opal_cr.c b/opal/runtime/opal_cr.c index c0499b40765..5fc619d6074 100644 --- a/opal/runtime/opal_cr.c +++ b/opal/runtime/opal_cr.c @@ -30,9 +30,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include @@ -46,9 +44,7 @@ #ifdef HAVE_SYS_STAT_H #include /* for mkfifo */ #endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/class/opal_object.h" #include "opal/util/opal_environ.h" diff --git a/opal/runtime/opal_params.c b/opal/runtime/opal_params.c index e89b67a88d3..39d5a535c6f 100644 --- a/opal/runtime/opal_params.c +++ b/opal/runtime/opal_params.c @@ -29,9 +29,7 @@ #include "opal_config.h" #include -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/constants.h" #include "opal/runtime/opal.h" diff --git a/opal/threads/condition.h b/opal/threads/condition.h index 75dcaa8ced1..cb510cf85ac 100644 --- a/opal/threads/condition.h +++ b/opal/threads/condition.h @@ -26,9 +26,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include #include "opal/threads/mutex.h" diff --git a/opal/threads/threads.h b/opal/threads/threads.h index d5f56fd721e..367315cb50f 100644 --- a/opal/threads/threads.h +++ b/opal/threads/threads.h @@ -26,9 +26,7 @@ #include "opal_config.h" #include -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/class/opal_object.h" #if OPAL_ENABLE_DEBUG diff --git a/opal/tools/opal-checkpoint/opal-checkpoint.c b/opal/tools/opal-checkpoint/opal-checkpoint.c index 5c820d19365..4cef950d9ce 100644 --- a/opal/tools/opal-checkpoint/opal-checkpoint.c +++ b/opal/tools/opal-checkpoint/opal-checkpoint.c @@ -31,9 +31,7 @@ #include #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ @@ -49,12 +47,8 @@ #ifdef HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/constants.h" diff --git a/opal/tools/opal-restart/opal-restart.c b/opal/tools/opal-restart/opal-restart.c index 3e36a0fb447..cb8374b01ca 100644 --- a/opal/tools/opal-restart/opal-restart.c +++ b/opal/tools/opal-restart/opal-restart.c @@ -38,9 +38,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_SYS_STAT_H #include #endif @@ -53,9 +51,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/constants.h" diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c index 018716a2250..075e4d367ca 100644 --- a/opal/tools/wrappers/opal_wrapper.c +++ b/opal/tools/wrappers/opal_wrapper.c @@ -24,9 +24,7 @@ #include #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ @@ -39,9 +37,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif /* HAVE_SYS_WAIT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/installdirs/installdirs.h" #include "opal/runtime/opal.h" diff --git a/opal/util/argv.c b/opal/util/argv.c index 242e111537e..aabb84127f2 100644 --- a/opal/util/argv.c +++ b/opal/util/argv.c @@ -22,12 +22,8 @@ */ #include "opal_config.h" -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/util/argv.h" #include "opal/constants.h" diff --git a/opal/util/basename.c b/opal/util/basename.c index c664a5778aa..1558f4554f4 100644 --- a/opal/util/basename.c +++ b/opal/util/basename.c @@ -23,9 +23,7 @@ #include "opal_config.h" #include -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_LIBGEN_H #include #endif /* HAVE_LIBGEN_H */ diff --git a/opal/util/cmd_line.c b/opal/util/cmd_line.c index 49703bc8c14..cc1e99e0f88 100644 --- a/opal/util/cmd_line.c +++ b/opal/util/cmd_line.c @@ -24,9 +24,7 @@ #include "opal_config.h" #include -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #include "opal/class/opal_object.h" diff --git a/opal/util/crc.c b/opal/util/crc.c index 4187bdc7386..d74d434fe89 100644 --- a/opal/util/crc.c +++ b/opal/util/crc.c @@ -22,15 +22,11 @@ #ifdef HAVE_STDIO_H #include #endif /* HAVE_STDIO_H */ -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_STRINGS_H #include #endif /* HAVE_STRINGS_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/opal/util/error.c b/opal/util/error.c index e558b029498..677423ee3de 100644 --- a/opal/util/error.c +++ b/opal/util/error.c @@ -23,14 +23,10 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include -#ifdef HAVE_STDLIB_H #include -#endif #include "opal/util/error.h" #include "opal/constants.h" diff --git a/opal/util/keyval_parse.c b/opal/util/keyval_parse.c index 8561ecb7c6d..8285d681186 100644 --- a/opal/util/keyval_parse.c +++ b/opal/util/keyval_parse.c @@ -26,9 +26,7 @@ #include "opal/util/keyval/keyval_lex.h" #include "opal/util/output.h" #include "opal/threads/mutex.h" -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ int opal_util_keyval_parse_lineno = 0; diff --git a/opal/util/opal_getcwd.c b/opal/util/opal_getcwd.c index fa32b111bd7..e529c008e76 100644 --- a/opal/util/opal_getcwd.c +++ b/opal/util/opal_getcwd.c @@ -20,9 +20,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/basename.h" #include "opal/util/opal_getcwd.h" diff --git a/opal/util/opal_pty.c b/opal/util/opal_pty.c index 165031f1b72..014eacb8c72 100644 --- a/opal/util/opal_pty.c +++ b/opal/util/opal_pty.c @@ -71,9 +71,7 @@ # include #endif #include -#ifdef HAVE_STRING_H # include -#endif #ifdef HAVE_GRP_H #include #endif diff --git a/opal/util/output.h b/opal/util/output.h index 61c1057146d..b8f7cd372fe 100644 --- a/opal/util/output.h +++ b/opal/util/output.h @@ -65,9 +65,7 @@ #include "opal_config.h" -#ifdef HAVE_STDARG_H #include -#endif #include "opal/class/opal_object.h" diff --git a/opal/util/stacktrace.c b/opal/util/stacktrace.c index 70bf49da1ac..9c631ea275d 100644 --- a/opal/util/stacktrace.c +++ b/opal/util/stacktrace.c @@ -25,13 +25,8 @@ #include #endif -#ifdef HAVE_STRING_H #include -#endif - -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/util/stacktrace.h" #include "opal/mca/backtrace/backtrace.h" diff --git a/opal/util/sys_limits.c b/opal/util/sys_limits.c index 378a2dfce88..9be0a6120fb 100644 --- a/opal/util/sys_limits.c +++ b/opal/util/sys_limits.c @@ -25,9 +25,7 @@ #include "opal_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_SYS_TYPES_H diff --git a/opal/util/timings.c b/opal/util/timings.c index 018582cc690..9459ab52050 100644 --- a/opal/util/timings.c +++ b/opal/util/timings.c @@ -15,9 +15,7 @@ #include #include -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_SYS_TYPES_H diff --git a/opal/win32/win_compat.h b/opal/win32/win_compat.h index 6a4d9d24b37..dc7aeb45f61 100644 --- a/opal/win32/win_compat.h +++ b/opal/win32/win_compat.h @@ -72,9 +72,7 @@ #include #include #include -#ifdef HAVE_STDINT_H #include -#endif /** * For all file io operations diff --git a/orte/mca/dfs/app/dfs_app.c b/orte/mca/dfs/app/dfs_app.c index cc13c0bb9d3..7110ff4fcdc 100644 --- a/orte/mca/dfs/app/dfs_app.c +++ b/orte/mca/dfs/app/dfs_app.c @@ -17,9 +17,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/orte/mca/dfs/base/dfs_base_frame.c b/orte/mca/dfs/base/dfs_base_frame.c index 66e13271bc2..77ce6171423 100644 --- a/orte/mca/dfs/base/dfs_base_frame.c +++ b/orte/mca/dfs/base/dfs_base_frame.c @@ -14,9 +14,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/orte/mca/dfs/base/dfs_base_select.c b/orte/mca/dfs/base/dfs_base_select.c index feff0a8bc49..51826442107 100644 --- a/orte/mca/dfs/base/dfs_base_select.c +++ b/orte/mca/dfs/base/dfs_base_select.c @@ -11,9 +11,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/dfs/orted/dfs_orted.c b/orte/mca/dfs/orted/dfs_orted.c index 64c75e20725..574db2fa005 100644 --- a/orte/mca/dfs/orted/dfs_orted.c +++ b/orte/mca/dfs/orted/dfs_orted.c @@ -18,9 +18,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/orte/mca/dfs/test/dfs_test.c b/orte/mca/dfs/test/dfs_test.c index 88a09c1635a..6d493d3ad27 100644 --- a/orte/mca/dfs/test/dfs_test.c +++ b/orte/mca/dfs/test/dfs_test.c @@ -17,9 +17,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/orte/mca/errmgr/base/errmgr_base_fns.c b/orte/mca/errmgr/base/errmgr_base_fns.c index b86498a345c..87da0a8b5d5 100644 --- a/orte/mca/errmgr/base/errmgr_base_fns.c +++ b/orte/mca/errmgr/base/errmgr_base_fns.c @@ -27,9 +27,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #if HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ diff --git a/orte/mca/errmgr/base/errmgr_base_frame.c b/orte/mca/errmgr/base/errmgr_base_frame.c index 7f928d22dd4..455779cdc13 100644 --- a/orte/mca/errmgr/base/errmgr_base_frame.c +++ b/orte/mca/errmgr/base/errmgr_base_frame.c @@ -26,9 +26,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/orte/mca/errmgr/base/errmgr_base_select.c b/orte/mca/errmgr/base/errmgr_base_select.c index 5664fbdad2b..761019c9ceb 100644 --- a/orte/mca/errmgr/base/errmgr_base_select.c +++ b/orte/mca/errmgr/base/errmgr_base_select.c @@ -22,9 +22,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/errmgr/base/errmgr_base_tool.c b/orte/mca/errmgr/base/errmgr_base_tool.c index 38ce2d1b3fb..6fe45e0d913 100644 --- a/orte/mca/errmgr/base/errmgr_base_tool.c +++ b/orte/mca/errmgr/base/errmgr_base_tool.c @@ -14,9 +14,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #if HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ diff --git a/orte/mca/errmgr/default_app/errmgr_default_app.c b/orte/mca/errmgr/default_app/errmgr_default_app.c index 7f038125bbe..8ee289e040d 100644 --- a/orte/mca/errmgr/default_app/errmgr_default_app.c +++ b/orte/mca/errmgr/default_app/errmgr_default_app.c @@ -22,9 +22,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" #include "opal/dss/dss.h" diff --git a/orte/mca/errmgr/default_hnp/errmgr_default_hnp.c b/orte/mca/errmgr/default_hnp/errmgr_default_hnp.c index 35df2d0ad0a..1fd1d24403c 100644 --- a/orte/mca/errmgr/default_hnp/errmgr_default_hnp.c +++ b/orte/mca/errmgr/default_hnp/errmgr_default_hnp.c @@ -23,9 +23,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_WAIT_H #include #endif diff --git a/orte/mca/errmgr/default_orted/errmgr_default_orted.c b/orte/mca/errmgr/default_orted/errmgr_default_orted.c index 3dfd9998053..a686484a022 100644 --- a/orte/mca/errmgr/default_orted/errmgr_default_orted.c +++ b/orte/mca/errmgr/default_orted/errmgr_default_orted.c @@ -22,9 +22,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" #include "opal/dss/dss.h" diff --git a/orte/mca/errmgr/default_tool/errmgr_default_tool.c b/orte/mca/errmgr/default_tool/errmgr_default_tool.c index 24f660ed27d..98f039c0f3c 100644 --- a/orte/mca/errmgr/default_tool/errmgr_default_tool.c +++ b/orte/mca/errmgr/default_tool/errmgr_default_tool.c @@ -23,9 +23,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" #include "opal/dss/dss.h" diff --git a/orte/mca/ess/lsf/ess_lsf_module.c b/orte/mca/ess/lsf/ess_lsf_module.c index 82c96c0d1f9..55f1720c21d 100644 --- a/orte/mca/ess/lsf/ess_lsf_module.c +++ b/orte/mca/ess/lsf/ess_lsf_module.c @@ -25,9 +25,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #include diff --git a/orte/mca/ess/pmi/ess_pmi_module.c b/orte/mca/ess/pmi/ess_pmi_module.c index dbb615b6852..5ca7dcc6450 100644 --- a/orte/mca/ess/pmi/ess_pmi_module.c +++ b/orte/mca/ess/pmi/ess_pmi_module.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #ifdef HAVE_NETDB_H #include diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c index 7fa96bb3f03..b335148977d 100644 --- a/orte/mca/ess/singleton/ess_singleton_module.c +++ b/orte/mca/ess/singleton/ess_singleton_module.c @@ -26,9 +26,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/ess/slurm/ess_slurm_module.c b/orte/mca/ess/slurm/ess_slurm_module.c index 4f8cd2ce606..472b6aa9ee1 100644 --- a/orte/mca/ess/slurm/ess_slurm_module.c +++ b/orte/mca/ess/slurm/ess_slurm_module.c @@ -25,9 +25,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include diff --git a/orte/mca/ess/tm/ess_tm_module.c b/orte/mca/ess/tm/ess_tm_module.c index d08da6b485c..38e86416272 100644 --- a/orte/mca/ess/tm/ess_tm_module.c +++ b/orte/mca/ess/tm/ess_tm_module.c @@ -24,9 +24,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include diff --git a/orte/mca/filem/base/filem_base_fns.c b/orte/mca/filem/base/filem_base_fns.c index 3cfdc148bd6..61a52d94536 100644 --- a/orte/mca/filem/base/filem_base_fns.c +++ b/orte/mca/filem/base/filem_base_fns.c @@ -18,9 +18,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/filem/base/filem_base_receive.c b/orte/mca/filem/base/filem_base_receive.c index e84230aa039..581fe096138 100644 --- a/orte/mca/filem/base/filem_base_receive.c +++ b/orte/mca/filem/base/filem_base_receive.c @@ -27,9 +27,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/filem/base/filem_base_select.c b/orte/mca/filem/base/filem_base_select.c index 1940b645f64..0bcee7df966 100644 --- a/orte/mca/filem/base/filem_base_select.c +++ b/orte/mca/filem/base/filem_base_select.c @@ -18,9 +18,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" diff --git a/orte/mca/filem/raw/filem_raw_module.c b/orte/mca/filem/raw/filem_raw_module.c index 62492c3f8c8..aeedef2eaed 100644 --- a/orte/mca/filem/raw/filem_raw_module.c +++ b/orte/mca/filem/raw/filem_raw_module.c @@ -19,9 +19,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/iof/base/base.h b/orte/mca/iof/base/base.h index 2a304d1f5dd..4dd72e6c623 100644 --- a/orte/mca/iof/base/base.h +++ b/orte/mca/iof/base/base.h @@ -41,9 +41,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/class/opal_list.h" #include "opal/class/opal_bitmap.h" diff --git a/orte/mca/iof/base/iof_base_frame.c b/orte/mca/iof/base/iof_base_frame.c index 9bd683904df..f0018b5cf4c 100644 --- a/orte/mca/iof/base/iof_base_frame.c +++ b/orte/mca/iof/base/iof_base_frame.c @@ -25,9 +25,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #include "orte/mca/mca.h" diff --git a/orte/mca/iof/base/iof_base_output.c b/orte/mca/iof/base/iof_base_output.c index bcd0c2e0580..26ed8450201 100644 --- a/orte/mca/iof/base/iof_base_output.c +++ b/orte/mca/iof/base/iof_base_output.c @@ -26,16 +26,12 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include #include "opal/util/output.h" diff --git a/orte/mca/iof/hnp/iof_hnp.c b/orte/mca/iof/hnp/iof_hnp.c index 06e9d9b40bd..bd47bb9f51e 100644 --- a/orte/mca/iof/hnp/iof_hnp.c +++ b/orte/mca/iof/hnp/iof_hnp.c @@ -29,9 +29,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include diff --git a/orte/mca/iof/hnp/iof_hnp_read.c b/orte/mca/iof/hnp/iof_hnp_read.c index 3334d49ef0e..9027d72ab60 100644 --- a/orte/mca/iof/hnp/iof_hnp_read.c +++ b/orte/mca/iof/hnp/iof_hnp_read.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/hnp/iof_hnp_receive.c b/orte/mca/iof/hnp/iof_hnp_receive.c index c8e0aea23c2..a250cb994cf 100644 --- a/orte/mca/iof/hnp/iof_hnp_receive.c +++ b/orte/mca/iof/hnp/iof_hnp_receive.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include #else diff --git a/orte/mca/iof/hnp/iof_hnp_send.c b/orte/mca/iof/hnp/iof_hnp_send.c index e1aac5014f9..eafaefce6de 100644 --- a/orte/mca/iof/hnp/iof_hnp_send.c +++ b/orte/mca/iof/hnp/iof_hnp_send.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/mr_hnp/iof_mrhnp.c b/orte/mca/iof/mr_hnp/iof_mrhnp.c index e5c05c2af9b..c912f6df9fa 100644 --- a/orte/mca/iof/mr_hnp/iof_mrhnp.c +++ b/orte/mca/iof/mr_hnp/iof_mrhnp.c @@ -16,9 +16,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include diff --git a/orte/mca/iof/mr_hnp/iof_mrhnp_read.c b/orte/mca/iof/mr_hnp/iof_mrhnp_read.c index dd89f34c06c..e5cbb6d8abd 100644 --- a/orte/mca/iof/mr_hnp/iof_mrhnp_read.c +++ b/orte/mca/iof/mr_hnp/iof_mrhnp_read.c @@ -16,9 +16,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/mr_hnp/iof_mrhnp_receive.c b/orte/mca/iof/mr_hnp/iof_mrhnp_receive.c index d3b45fc8217..93750d2480c 100644 --- a/orte/mca/iof/mr_hnp/iof_mrhnp_receive.c +++ b/orte/mca/iof/mr_hnp/iof_mrhnp_receive.c @@ -16,9 +16,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include #else diff --git a/orte/mca/iof/mr_orted/iof_mrorted.c b/orte/mca/iof/mr_orted/iof_mrorted.c index f58decd21bc..7eed7cf86d4 100644 --- a/orte/mca/iof/mr_orted/iof_mrorted.c +++ b/orte/mca/iof/mr_orted/iof_mrorted.c @@ -18,9 +18,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include diff --git a/orte/mca/iof/mr_orted/iof_mrorted_read.c b/orte/mca/iof/mr_orted/iof_mrorted_read.c index a3540ff207f..b39a1aae65a 100644 --- a/orte/mca/iof/mr_orted/iof_mrorted_read.c +++ b/orte/mca/iof/mr_orted/iof_mrorted_read.c @@ -17,9 +17,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/mr_orted/iof_mrorted_receive.c b/orte/mca/iof/mr_orted/iof_mrorted_receive.c index ee1f3a8fdfb..32d3c6a0d90 100644 --- a/orte/mca/iof/mr_orted/iof_mrorted_receive.c +++ b/orte/mca/iof/mr_orted/iof_mrorted_receive.c @@ -17,9 +17,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/orted/iof_orted.c b/orte/mca/iof/orted/iof_orted.c index 3999063accf..d87de1f207b 100644 --- a/orte/mca/iof/orted/iof_orted.c +++ b/orte/mca/iof/orted/iof_orted.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_FCNTL_H #include diff --git a/orte/mca/iof/orted/iof_orted_read.c b/orte/mca/iof/orted/iof_orted_read.c index 91481c52327..2f64b8e6bad 100644 --- a/orte/mca/iof/orted/iof_orted_read.c +++ b/orte/mca/iof/orted/iof_orted_read.c @@ -26,9 +26,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/orted/iof_orted_receive.c b/orte/mca/iof/orted/iof_orted_receive.c index c1f14c25abc..efb3b6a67ee 100644 --- a/orte/mca/iof/orted/iof_orted_receive.c +++ b/orte/mca/iof/orted/iof_orted_receive.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/iof/tool/iof_tool.c b/orte/mca/iof/tool/iof_tool.c index 8def116f98a..7abe3970ba9 100644 --- a/orte/mca/iof/tool/iof_tool.c +++ b/orte/mca/iof/tool/iof_tool.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" diff --git a/orte/mca/iof/tool/iof_tool_receive.c b/orte/mca/iof/tool/iof_tool_receive.c index b31aa6e72b4..5aa99d569ba 100644 --- a/orte/mca/iof/tool/iof_tool_receive.c +++ b/orte/mca/iof/tool/iof_tool_receive.c @@ -27,9 +27,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/dss/dss.h" diff --git a/orte/mca/notifier/base/notifier_base_frame.c b/orte/mca/notifier/base/notifier_base_frame.c index 4f8ce0bea75..43393fee13c 100644 --- a/orte/mca/notifier/base/notifier_base_frame.c +++ b/orte/mca/notifier/base/notifier_base_frame.c @@ -24,9 +24,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/util/argv.h" diff --git a/orte/mca/notifier/base/notifier_base_select.c b/orte/mca/notifier/base/notifier_base_select.c index 5f2a3207350..cdd9142ff2e 100644 --- a/orte/mca/notifier/base/notifier_base_select.c +++ b/orte/mca/notifier/base/notifier_base_select.c @@ -21,9 +21,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/notifier/notifier.h b/orte/mca/notifier/notifier.h index 18181456e3f..cc40297c574 100644 --- a/orte/mca/notifier/notifier.h +++ b/orte/mca/notifier/notifier.h @@ -39,12 +39,8 @@ #include "orte_config.h" -#ifdef HAVE_STDARG_H #include -#endif -#ifdef HAVE_LIMITS_H #include -#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/orte/mca/notifier/smtp/notifier_smtp_module.c b/orte/mca/notifier/smtp/notifier_smtp_module.c index 7c202689523..53a035fe881 100644 --- a/orte/mca/notifier/smtp/notifier_smtp_module.c +++ b/orte/mca/notifier/smtp/notifier_smtp_module.c @@ -27,15 +27,11 @@ #include #include -#ifdef HAVE_STDARG_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/util/show_help.h" #include "opal/util/argv.h" diff --git a/orte/mca/notifier/syslog/notifier_syslog_module.c b/orte/mca/notifier/syslog/notifier_syslog_module.c index 17c011880fb..a8121685a33 100644 --- a/orte/mca/notifier/syslog/notifier_syslog_module.c +++ b/orte/mca/notifier/syslog/notifier_syslog_module.c @@ -28,9 +28,7 @@ #ifdef HAVE_SYSLOG_H #include #endif -#ifdef HAVE_STDARG_H #include -#endif #include "opal/util/show_help.h" diff --git a/orte/mca/odls/alps/odls_alps_module.c b/orte/mca/odls/alps/odls_alps_module.c index 8f81ed7aa23..a5f3ce11610 100644 --- a/orte/mca/odls/alps/odls_alps_module.c +++ b/orte/mca/odls/alps/odls_alps_module.c @@ -68,9 +68,7 @@ #include "orte/constants.h" #include "orte/types.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include @@ -95,15 +93,11 @@ #ifdef HAVE_NETDB_H #include #endif -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_STDARG_H #include -#endif #ifdef HAVE_SYS_SELECT_H #include #endif diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c index e394b12b576..b2b89b797e1 100644 --- a/orte/mca/odls/base/odls_base_default_fns.c +++ b/orte/mca/odls/base/odls_base_default_fns.c @@ -39,9 +39,7 @@ #ifdef HAVE_SYS_PARAM_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include diff --git a/orte/mca/odls/base/odls_base_frame.c b/orte/mca/odls/base/odls_base_frame.c index 405e9bd46bc..e615433957b 100644 --- a/orte/mca/odls/base/odls_base_frame.c +++ b/orte/mca/odls/base/odls_base_frame.c @@ -26,9 +26,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/class/opal_ring_buffer.h" #include "orte/mca/mca.h" diff --git a/orte/mca/odls/default/odls_default_module.c b/orte/mca/odls/default/odls_default_module.c index 28ff1ffd8ab..2f000de4d65 100644 --- a/orte/mca/odls/default/odls_default_module.c +++ b/orte/mca/odls/default/odls_default_module.c @@ -68,9 +68,7 @@ #include "orte/constants.h" #include "orte/types.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include @@ -95,15 +93,11 @@ #ifdef HAVE_NETDB_H #include #endif -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_STDARG_H #include -#endif #ifdef HAVE_SYS_SELECT_H #include #endif diff --git a/orte/mca/plm/alps/plm_alps_module.c b/orte/mca/plm/alps/plm_alps_module.c index 76d9a2745b3..912ab359e7b 100644 --- a/orte/mca/plm/alps/plm_alps_module.c +++ b/orte/mca/plm/alps/plm_alps_module.c @@ -36,12 +36,8 @@ #include #endif #include -#ifdef HAVE_STDLIB_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/plm/base/plm_base_orted_cmds.c b/orte/mca/plm/base/plm_base_orted_cmds.c index c760eb313f8..c4e0c4081d4 100644 --- a/orte/mca/plm/base/plm_base_orted_cmds.c +++ b/orte/mca/plm/base/plm_base_orted_cmds.c @@ -23,9 +23,7 @@ #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/base/plm_base_receive.c b/orte/mca/plm/base/plm_base_receive.c index d835e237492..6a45e848f94 100644 --- a/orte/mca/plm/base/plm_base_receive.c +++ b/orte/mca/plm/base/plm_base_receive.c @@ -28,9 +28,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/orte/mca/plm/lsf/plm_lsf_module.c b/orte/mca/plm/lsf/plm_lsf_module.c index d62b98401a2..a62632cace9 100644 --- a/orte/mca/plm/lsf/plm_lsf_module.c +++ b/orte/mca/plm/lsf/plm_lsf_module.c @@ -37,9 +37,7 @@ #include #endif #include -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/plm/rsh/plm_rsh.h b/orte/mca/plm/rsh/plm_rsh.h index bdbb50b4ff9..c02abd15b72 100644 --- a/orte/mca/plm/rsh/plm_rsh.h +++ b/orte/mca/plm/rsh/plm_rsh.h @@ -33,9 +33,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#if HAVE_TIME_H #include -#endif #include "opal/threads/condition.h" #include "orte/mca/mca.h" diff --git a/orte/mca/plm/rsh/plm_rsh_module.c b/orte/mca/plm/rsh/plm_rsh_module.c index 77065ffcafa..b84ef4a7702 100644 --- a/orte/mca/plm/rsh/plm_rsh_module.c +++ b/orte/mca/plm/rsh/plm_rsh_module.c @@ -48,9 +48,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index 608e1818232..fb8f378b63c 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -28,17 +28,13 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include #endif #include -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/plm/tm/plm_tm_module.c b/orte/mca/plm/tm/plm_tm_module.c index 7413a1c26c9..bc007359f02 100644 --- a/orte/mca/plm/tm/plm_tm_module.c +++ b/orte/mca/plm/tm/plm_tm_module.c @@ -30,9 +30,7 @@ #include "orte/constants.h" #include "orte/types.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include diff --git a/orte/mca/qos/base/qos_base_channel_handlers.c b/orte/mca/qos/base/qos_base_channel_handlers.c index 1f8cdccbff3..51e8afa1836 100644 --- a/orte/mca/qos/base/qos_base_channel_handlers.c +++ b/orte/mca/qos/base/qos_base_channel_handlers.c @@ -16,9 +16,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/qos/noop/qos_noop_channel_handlers.c b/orte/mca/qos/noop/qos_noop_channel_handlers.c index da74cc28168..ad9678ff3fc 100644 --- a/orte/mca/qos/noop/qos_noop_channel_handlers.c +++ b/orte/mca/qos/noop/qos_noop_channel_handlers.c @@ -16,9 +16,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/ras/base/ras_base_allocate.c b/orte/mca/ras/base/ras_base_allocate.c index 71aa924b2cc..353d1236f5e 100644 --- a/orte/mca/ras/base/ras_base_allocate.c +++ b/orte/mca/ras/base/ras_base_allocate.c @@ -21,9 +21,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/rmaps/base/rmaps_base_frame.c b/orte/mca/rmaps/base/rmaps_base_frame.c index 1dccff654c7..b24b5dcc714 100644 --- a/orte/mca/rmaps/base/rmaps_base_frame.c +++ b/orte/mca/rmaps/base/rmaps_base_frame.c @@ -25,9 +25,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/util/argv.h" diff --git a/orte/mca/rmaps/lama/rmaps_lama_module.c b/orte/mca/rmaps/lama/rmaps_lama_module.c index 482369c4cc7..5a1c20b1217 100644 --- a/orte/mca/rmaps/lama/rmaps_lama_module.c +++ b/orte/mca/rmaps/lama/rmaps_lama_module.c @@ -20,9 +20,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/hwloc/hwloc.h" diff --git a/orte/mca/rmaps/mindist/rmaps_mindist_module.c b/orte/mca/rmaps/mindist/rmaps_mindist_module.c index 77837169a5e..93c6911c3eb 100644 --- a/orte/mca/rmaps/mindist/rmaps_mindist_module.c +++ b/orte/mca/rmaps/mindist/rmaps_mindist_module.c @@ -30,9 +30,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/base/mca_base_var.h" diff --git a/orte/mca/rmaps/ppr/rmaps_ppr.c b/orte/mca/rmaps/ppr/rmaps_ppr.c index f37d0b62dd5..4448dc24f80 100644 --- a/orte/mca/rmaps/ppr/rmaps_ppr.c +++ b/orte/mca/rmaps/ppr/rmaps_ppr.c @@ -18,9 +18,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/hwloc/base/base.h" #include "opal/util/argv.h" diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.c b/orte/mca/rmaps/rank_file/rmaps_rank_file.c index 4dcfdbd5cef..47d263d3508 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file.c @@ -33,9 +33,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/util/argv.h" #include "opal/util/if.h" diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c index 3e9a5f1ee11..e09c3290a1e 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c @@ -25,9 +25,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/mca/base/base.h" #include "opal/mca/hwloc/base/base.h" diff --git a/orte/mca/rmaps/resilient/rmaps_resilient.c b/orte/mca/rmaps/resilient/rmaps_resilient.c index 1dedcbe4a5a..bdf7ca32925 100644 --- a/orte/mca/rmaps/resilient/rmaps_resilient.c +++ b/orte/mca/rmaps/resilient/rmaps_resilient.c @@ -22,9 +22,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #include "opal/util/argv.h" diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.c b/orte/mca/rmaps/round_robin/rmaps_rr.c index 6969a679051..f3414d343fc 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr.c +++ b/orte/mca/rmaps/round_robin/rmaps_rr.c @@ -28,9 +28,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c index 0e844e95319..db601d63861 100644 --- a/orte/mca/rmaps/seq/rmaps_seq.c +++ b/orte/mca/rmaps/seq/rmaps_seq.c @@ -30,9 +30,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include #include "opal/util/if.h" diff --git a/orte/mca/rmaps/staged/rmaps_staged.c b/orte/mca/rmaps/staged/rmaps_staged.c index 7817bf356ec..54519ff9b31 100644 --- a/orte/mca/rmaps/staged/rmaps_staged.c +++ b/orte/mca/rmaps/staged/rmaps_staged.c @@ -17,9 +17,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/hwloc/base/base.h" #include "opal/dss/dss.h" diff --git a/orte/mca/rml/base/rml_base_channel_handlers.c b/orte/mca/rml/base/rml_base_channel_handlers.c index cd5112106d6..9d0092887f5 100644 --- a/orte/mca/rml/base/rml_base_channel_handlers.c +++ b/orte/mca/rml/base/rml_base_channel_handlers.c @@ -17,9 +17,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/rml/base/rml_base_frame.c b/orte/mca/rml/base/rml_base_frame.c index b28adc81a6a..54dc454426d 100644 --- a/orte/mca/rml/base/rml_base_frame.c +++ b/orte/mca/rml/base/rml_base_frame.c @@ -17,9 +17,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/dss/dss.h" #include "orte/mca/mca.h" diff --git a/orte/mca/rml/base/rml_base_msg_handlers.c b/orte/mca/rml/base/rml_base_msg_handlers.c index f35e4922c83..758bf9105f2 100644 --- a/orte/mca/rml/base/rml_base_msg_handlers.c +++ b/orte/mca/rml/base/rml_base_msg_handlers.c @@ -28,9 +28,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/rml/base/rml_base_receive.c b/orte/mca/rml/base/rml_base_receive.c index 3fbc2516c72..a8c6b1247b4 100644 --- a/orte/mca/rml/base/rml_base_receive.c +++ b/orte/mca/rml/base/rml_base_receive.c @@ -27,9 +27,7 @@ */ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/mca/rtc/base/rtc_base_frame.c b/orte/mca/rtc/base/rtc_base_frame.c index 9b4e3e8a281..d61caa82667 100644 --- a/orte/mca/rtc/base/rtc_base_frame.c +++ b/orte/mca/rtc/base/rtc_base_frame.c @@ -12,9 +12,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/class/opal_list.h" diff --git a/orte/mca/rtc/freq/rtc_freq.c b/orte/mca/rtc/freq/rtc_freq.c index 3aa1e56165e..703de6ef80c 100644 --- a/orte/mca/rtc/freq/rtc_freq.c +++ b/orte/mca/rtc/freq/rtc_freq.c @@ -17,9 +17,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_DIRENT_H #include #endif /* HAVE_DIRENT_H */ diff --git a/orte/mca/rtc/hwloc/rtc_hwloc.c b/orte/mca/rtc/hwloc/rtc_hwloc.c index b62f53c8437..bb12e5994e9 100644 --- a/orte/mca/rtc/hwloc/rtc_hwloc.c +++ b/orte/mca/rtc/hwloc/rtc_hwloc.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/mca/hwloc/hwloc.h" #include "opal/util/argv.h" diff --git a/orte/mca/schizo/base/schizo_base_frame.c b/orte/mca/schizo/base/schizo_base_frame.c index 5e84f4d4f3d..5bdd4cf3e18 100644 --- a/orte/mca/schizo/base/schizo_base_frame.c +++ b/orte/mca/schizo/base/schizo_base_frame.c @@ -12,9 +12,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/util/argv.h" diff --git a/orte/mca/snapc/base/snapc_base_fns.c b/orte/mca/snapc/base/snapc_base_fns.c index 340f61e59e2..ce326fcfbb5 100644 --- a/orte/mca/snapc/base/snapc_base_fns.c +++ b/orte/mca/snapc/base/snapc_base_fns.c @@ -19,9 +19,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ diff --git a/orte/mca/snapc/base/snapc_base_frame.c b/orte/mca/snapc/base/snapc_base_frame.c index e9ce77fa892..0b85be707fc 100644 --- a/orte/mca/snapc/base/snapc_base_frame.c +++ b/orte/mca/snapc/base/snapc_base_frame.c @@ -21,9 +21,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/orte/mca/snapc/base/snapc_base_select.c b/orte/mca/snapc/base/snapc_base_select.c index 0a62791dc57..18284b322bd 100644 --- a/orte/mca/snapc/base/snapc_base_select.c +++ b/orte/mca/snapc/base/snapc_base_select.c @@ -17,9 +17,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" diff --git a/orte/mca/snapc/full/snapc_full_app.c b/orte/mca/snapc/full/snapc_full_app.c index 88e90ca7d60..1dd5a8d5edd 100644 --- a/orte/mca/snapc/full/snapc_full_app.c +++ b/orte/mca/snapc/full/snapc_full_app.c @@ -30,12 +30,8 @@ #ifdef HAVE_SYS_STAT_H #include /* for mkfifo */ #endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_SIGNAL_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif #include "orte/runtime/orte_cr.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c index 193c7ed22c7..10d0419840c 100644 --- a/orte/mca/snapc/full/snapc_full_global.c +++ b/orte/mca/snapc/full/snapc_full_global.c @@ -21,9 +21,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/include/opal/prefetch.h" #include "opal/util/output.h" diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c index c2051708f7e..0596fc1d9d0 100644 --- a/orte/mca/snapc/full/snapc_full_local.c +++ b/orte/mca/snapc/full/snapc_full_local.c @@ -22,9 +22,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_SIGNAL_H #include -#endif #ifdef HAVE_FCNTL_H #include #endif /* HAVE_FCNTL_H */ @@ -37,9 +35,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_STRING_H #include -#endif #include "opal/runtime/opal_progress.h" #include "opal/runtime/opal_cr.h" diff --git a/orte/mca/sstore/base/sstore_base_fns.c b/orte/mca/sstore/base/sstore_base_fns.c index af2dda880bc..665a94ec17c 100644 --- a/orte/mca/sstore/base/sstore_base_fns.c +++ b/orte/mca/sstore/base/sstore_base_fns.c @@ -13,9 +13,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/mca/sstore/base/sstore_base_select.c b/orte/mca/sstore/base/sstore_base_select.c index 2b598a3c143..0ea003d56a9 100644 --- a/orte/mca/sstore/base/sstore_base_select.c +++ b/orte/mca/sstore/base/sstore_base_select.c @@ -10,9 +10,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" diff --git a/orte/mca/sstore/central/sstore_central_app.c b/orte/mca/sstore/central/sstore_central_app.c index c0f685f682e..09a84198741 100644 --- a/orte/mca/sstore/central/sstore_central_app.c +++ b/orte/mca/sstore/central/sstore_central_app.c @@ -14,9 +14,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/central/sstore_central_global.c b/orte/mca/sstore/central/sstore_central_global.c index 1193bdc081c..15cbb31359d 100644 --- a/orte/mca/sstore/central/sstore_central_global.c +++ b/orte/mca/sstore/central/sstore_central_global.c @@ -17,9 +17,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/central/sstore_central_local.c b/orte/mca/sstore/central/sstore_central_local.c index 231ac3f0301..cf36b1823d2 100644 --- a/orte/mca/sstore/central/sstore_central_local.c +++ b/orte/mca/sstore/central/sstore_central_local.c @@ -17,9 +17,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/central/sstore_central_module.c b/orte/mca/sstore/central/sstore_central_module.c index 26f25d31366..7c02196632f 100644 --- a/orte/mca/sstore/central/sstore_central_module.c +++ b/orte/mca/sstore/central/sstore_central_module.c @@ -14,9 +14,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/stage/sstore_stage_app.c b/orte/mca/sstore/stage/sstore_stage_app.c index 6f146d971bb..1bf26b840f7 100644 --- a/orte/mca/sstore/stage/sstore_stage_app.c +++ b/orte/mca/sstore/stage/sstore_stage_app.c @@ -14,9 +14,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/stage/sstore_stage_global.c b/orte/mca/sstore/stage/sstore_stage_global.c index 1201f3b268b..45f2bf15fe4 100644 --- a/orte/mca/sstore/stage/sstore_stage_global.c +++ b/orte/mca/sstore/stage/sstore_stage_global.c @@ -17,9 +17,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/stage/sstore_stage_local.c b/orte/mca/sstore/stage/sstore_stage_local.c index 9d8e69d98ea..46ad2774e81 100644 --- a/orte/mca/sstore/stage/sstore_stage_local.c +++ b/orte/mca/sstore/stage/sstore_stage_local.c @@ -17,9 +17,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/sstore/stage/sstore_stage_module.c b/orte/mca/sstore/stage/sstore_stage_module.c index 85bdcb73ed5..7a03e88b093 100644 --- a/orte/mca/sstore/stage/sstore_stage_module.c +++ b/orte/mca/sstore/stage/sstore_stage_module.c @@ -14,9 +14,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/orte/mca/state/app/state_app.c b/orte/mca/state/app/state_app.c index b00ee33f939..282d114c378 100644 --- a/orte/mca/state/app/state_app.c +++ b/orte/mca/state/app/state_app.c @@ -14,9 +14,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" diff --git a/orte/mca/state/base/state_base_frame.c b/orte/mca/state/base/state_base_frame.c index fca8ed385f2..3838d901dd9 100644 --- a/orte/mca/state/base/state_base_frame.c +++ b/orte/mca/state/base/state_base_frame.c @@ -15,9 +15,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/orte/mca/state/base/state_base_select.c b/orte/mca/state/base/state_base_select.c index 1eed4387b5f..29a56c96f71 100644 --- a/orte/mca/state/base/state_base_select.c +++ b/orte/mca/state/base/state_base_select.c @@ -12,9 +12,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/state/dvm/state_dvm.c b/orte/mca/state/dvm/state_dvm.c index 02fda398305..0e7309c8a36 100644 --- a/orte/mca/state/dvm/state_dvm.c +++ b/orte/mca/state/dvm/state_dvm.c @@ -13,9 +13,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" diff --git a/orte/mca/state/hnp/state_hnp.c b/orte/mca/state/hnp/state_hnp.c index c6c0c0fcd2a..1e24cf60c11 100644 --- a/orte/mca/state/hnp/state_hnp.c +++ b/orte/mca/state/hnp/state_hnp.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" diff --git a/orte/mca/state/novm/state_novm.c b/orte/mca/state/novm/state_novm.c index 38f8bc5816d..b982612b84d 100644 --- a/orte/mca/state/novm/state_novm.c +++ b/orte/mca/state/novm/state_novm.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" diff --git a/orte/mca/state/orted/state_orted.c b/orte/mca/state/orted/state_orted.c index bc80e0ddf9c..e506cc9ed40 100644 --- a/orte/mca/state/orted/state_orted.c +++ b/orte/mca/state/orted/state_orted.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" #include "opal/dss/dss.h" diff --git a/orte/mca/state/staged_hnp/state_staged_hnp.c b/orte/mca/state/staged_hnp/state_staged_hnp.c index 844b617f938..801e4f30710 100644 --- a/orte/mca/state/staged_hnp/state_staged_hnp.c +++ b/orte/mca/state/staged_hnp/state_staged_hnp.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" diff --git a/orte/mca/state/staged_orted/state_staged_orted.c b/orte/mca/state/staged_orted/state_staged_orted.c index aaf08bbf0b1..672fd466b31 100644 --- a/orte/mca/state/staged_orted/state_staged_orted.c +++ b/orte/mca/state/staged_orted/state_staged_orted.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" #include "opal/dss/dss.h" diff --git a/orte/mca/state/tool/state_tool.c b/orte/mca/state/tool/state_tool.c index 2041c577cd3..12bdef2c7b3 100644 --- a/orte/mca/state/tool/state_tool.c +++ b/orte/mca/state/tool/state_tool.c @@ -15,9 +15,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/output.h" diff --git a/orte/orted/orted.h b/orte/orted/orted.h index 052cf2fbd1d..b1107d92fc3 100644 --- a/orte/orted/orted.h +++ b/orte/orted/orted.h @@ -22,9 +22,7 @@ #include "orte_config.h" #include "orte/types.h" -#ifdef HAVE_TIME_H #include -#endif #include "opal/dss/dss_types.h" #include "opal/class/opal_pointer_array.h" diff --git a/orte/orted/orted_comm.c b/orte/orted/orted_comm.c index d97a630a649..4c26488f6ea 100644 --- a/orte/orted/orted_comm.c +++ b/orte/orted/orted_comm.c @@ -40,9 +40,7 @@ #include #include #include -#ifdef HAVE_TIME_H #include -#endif #include "opal/mca/event/event.h" diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c index e26dda01921..c428253fdbe 100644 --- a/orte/orted/orted_main.c +++ b/orte/orted/orted_main.c @@ -28,9 +28,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #include 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 c776e9efd2f..6e004aa790f 100644 --- a/orte/runtime/data_type_support/orte_dt_compare_fns.c +++ b/orte/runtime/data_type_support/orte_dt_compare_fns.c @@ -19,9 +19,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include diff --git a/orte/runtime/data_type_support/orte_dt_copy_fns.c b/orte/runtime/data_type_support/orte_dt_copy_fns.c index 37fd945c6f3..87c3a82badd 100644 --- a/orte/runtime/data_type_support/orte_dt_copy_fns.c +++ b/orte/runtime/data_type_support/orte_dt_copy_fns.c @@ -25,9 +25,7 @@ #ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/argv.h" #include "opal/dss/dss.h" diff --git a/orte/runtime/orte_data_server.c b/orte/runtime/orte_data_server.c index 22d5bad3320..4a179812716 100644 --- a/orte/runtime/orte_data_server.c +++ b/orte/runtime/orte_data_server.c @@ -23,9 +23,7 @@ #include "orte/constants.h" #include "orte/types.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_SYS_TIME_H #include diff --git a/orte/runtime/orte_quit.c b/orte/runtime/orte_quit.c index f0ae7c0669e..b38a6b5db4b 100644 --- a/orte/runtime/orte_quit.c +++ b/orte/runtime/orte_quit.c @@ -26,9 +26,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include diff --git a/orte/runtime/orte_wait.c b/orte/runtime/orte_wait.c index ca33559aa4f..6e9f604f38d 100644 --- a/orte/runtime/orte_wait.c +++ b/orte/runtime/orte_wait.c @@ -24,9 +24,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include #ifdef HAVE_UNISTD_H #include diff --git a/orte/runtime/orte_wait.h b/orte/runtime/orte_wait.h index 6b81ef0d69c..5290b36d492 100644 --- a/orte/runtime/orte_wait.h +++ b/orte/runtime/orte_wait.h @@ -35,9 +35,7 @@ #ifdef HAVE_SYS_TYPES_H #include #endif -#if HAVE_TIME_H #include -#endif #if HAVE_SYS_TIME_H #include #endif diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.c b/orte/tools/orte-checkpoint/orte-checkpoint.c index d615b34c3ad..b51d8f538ce 100644 --- a/orte/tools/orte-checkpoint/orte-checkpoint.c +++ b/orte/tools/orte-checkpoint/orte-checkpoint.c @@ -31,9 +31,7 @@ #include #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ @@ -49,9 +47,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif /* HAVE_SYS_WAIT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/util/cmd_line.h" diff --git a/orte/tools/orte-clean/orte-clean.c b/orte/tools/orte-clean/orte-clean.c index 9d0feeb1e8b..ad83cf474cf 100644 --- a/orte/tools/orte-clean/orte-clean.c +++ b/orte/tools/orte-clean/orte-clean.c @@ -30,9 +30,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ @@ -45,9 +43,7 @@ #ifdef HAVE_SYS_PARAM_H #include #endif /* HAVE_SYS_PARAM_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_DIRENT_H #include #endif /* HAVE_DIRENT_H */ diff --git a/orte/tools/orte-dvm/orte-dvm.c b/orte/tools/orte-dvm/orte-dvm.c index 66007fdf390..79a03445993 100644 --- a/orte/tools/orte-dvm/orte-dvm.c +++ b/orte/tools/orte-dvm/orte-dvm.c @@ -25,13 +25,9 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_STRINGS_H #include #endif /* HAVE_STRINGS_H */ diff --git a/orte/tools/orte-info/orte-info.c b/orte/tools/orte-info/orte-info.c index 23372513518..5b2230fbb52 100644 --- a/orte/tools/orte-info/orte-info.c +++ b/orte/tools/orte-info/orte-info.c @@ -37,9 +37,7 @@ #include #endif #include -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/mca/installdirs/installdirs.h" #include "opal/class/opal_object.h" diff --git a/orte/tools/orte-info/output.c b/orte/tools/orte-info/output.c index 7bcb2f56901..44839e02724 100644 --- a/orte/tools/orte-info/output.c +++ b/orte/tools/orte-info/output.c @@ -24,9 +24,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_SIGNAL_H #include -#endif #ifdef HAVE_TERMIOS_H #include #endif diff --git a/orte/tools/orte-migrate/orte-migrate.c b/orte/tools/orte-migrate/orte-migrate.c index b080af82e33..6b7f9827ad7 100644 --- a/orte/tools/orte-migrate/orte-migrate.c +++ b/orte/tools/orte-migrate/orte-migrate.c @@ -22,9 +22,7 @@ #include #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ @@ -40,9 +38,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif /* HAVE_SYS_WAIT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/util/cmd_line.h" diff --git a/orte/tools/orte-ps/orte-ps.c b/orte/tools/orte-ps/orte-ps.c index e09877550e7..2a06ce29b29 100644 --- a/orte/tools/orte-ps/orte-ps.c +++ b/orte/tools/orte-ps/orte-ps.c @@ -38,9 +38,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ @@ -50,9 +48,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif /* HAVE_SYS_WAIT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_DIRENT_H #include #endif /* HAVE_DIRENT_H */ diff --git a/orte/tools/orte-restart/orte-restart.c b/orte/tools/orte-restart/orte-restart.c index be407bceddb..9a7974e8e64 100644 --- a/orte/tools/orte-restart/orte-restart.c +++ b/orte/tools/orte-restart/orte-restart.c @@ -34,9 +34,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ @@ -46,9 +44,7 @@ #ifdef HAVE_SYS_WAIT_H #include #endif /* HAVE_SYS_WAIT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/runtime/opal.h" #include "opal/runtime/opal_cr.h" diff --git a/orte/tools/orte-server/orte-server.c b/orte/tools/orte-server/orte-server.c index 19eaea63b53..55c9328e186 100644 --- a/orte/tools/orte-server/orte-server.c +++ b/orte/tools/orte-server/orte-server.c @@ -23,9 +23,7 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include #include diff --git a/orte/tools/orte-submit/orte-submit.c b/orte/tools/orte-submit/orte-submit.c index b9fe91e7724..daf924e9cbe 100644 --- a/orte/tools/orte-submit/orte-submit.c +++ b/orte/tools/orte-submit/orte-submit.c @@ -27,13 +27,9 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_STRINGS_H #include #endif /* HAVE_STRINGS_H */ diff --git a/orte/tools/orted/orted.c b/orte/tools/orted/orted.c index 04ea15d40ed..efca625321b 100644 --- a/orte/tools/orted/orted.c +++ b/orte/tools/orted/orted.c @@ -22,9 +22,7 @@ #include "orte_config.h" #include -#ifdef HAVE_LIMITS_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c index 4ba1c22c3dc..342a1715ce5 100644 --- a/orte/tools/orterun/orterun.c +++ b/orte/tools/orterun/orterun.c @@ -27,13 +27,9 @@ #include "orte_config.h" #include "orte/constants.h" -#ifdef HAVE_STRING_H #include -#endif #include -#ifdef HAVE_STDLIB_H #include -#endif /* HAVE_STDLIB_H */ #ifdef HAVE_STRINGS_H #include #endif /* HAVE_STRINGS_H */ diff --git a/orte/util/dash_host/dash_host.c b/orte/util/dash_host/dash_host.c index 90d6d39a025..f5d7a83683a 100644 --- a/orte/util/dash_host/dash_host.c +++ b/orte/util/dash_host/dash_host.c @@ -22,9 +22,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "orte/constants.h" #include "orte/types.h" diff --git a/orte/util/error_strings.c b/orte/util/error_strings.c index 03ecd1ec5cd..c28212c8bd6 100644 --- a/orte/util/error_strings.c +++ b/orte/util/error_strings.c @@ -29,10 +29,8 @@ #ifdef HAVE_SYS_SIGNAL_H #include #else -#ifdef HAVE_SIGNAL_H #include #endif -#endif #include "orte/mca/plm/plm_types.h" #include "orte/util/error_strings.h" diff --git a/orte/util/pre_condition_transports.c b/orte/util/pre_condition_transports.c index 4ec6193bcee..2585151185b 100644 --- a/orte/util/pre_condition_transports.c +++ b/orte/util/pre_condition_transports.c @@ -21,9 +21,7 @@ #include "orte_config.h" -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif @@ -36,9 +34,7 @@ #ifdef HAVE_FCNTL_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include "opal/mca/base/mca_base_var.h" #include "opal/util/alfg.h" diff --git a/orte/util/proc_info.h b/orte/util/proc_info.h index c19b8c57497..07c53314b32 100644 --- a/orte/util/proc_info.h +++ b/orte/util/proc_info.h @@ -31,9 +31,7 @@ #include "orte_config.h" -#ifdef HAVE_STDINT_H #include -#endif #ifdef HAVE_SYS_TYPES_H #include diff --git a/oshmem/mca/spml/base/spml_base_frame.c b/oshmem/mca/spml/base/spml_base_frame.c index f7557a8e809..dd45a71fbbb 100644 --- a/oshmem/mca/spml/base/spml_base_frame.c +++ b/oshmem/mca/spml/base/spml_base_frame.c @@ -16,9 +16,7 @@ #include "oshmem_config.h" #include -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNIST_H */ diff --git a/oshmem/mca/spml/base/spml_base_select.c b/oshmem/mca/spml/base/spml_base_select.c index 30a423e56bc..5fdd773a4d1 100644 --- a/oshmem/mca/spml/base/spml_base_select.c +++ b/oshmem/mca/spml/base/spml_base_select.c @@ -12,9 +12,7 @@ #include "oshmem_config.h" -#ifdef HAVE_STRING_H #include -#endif #include "opal/util/show_help.h" #include "opal/mca/base/base.h" diff --git a/oshmem/mca/sshmem/base/sshmem_base_select.c b/oshmem/mca/sshmem/base/sshmem_base_select.c index f59fbdf5112..8762e27c506 100644 --- a/oshmem/mca/sshmem/base/sshmem_base_select.c +++ b/oshmem/mca/sshmem/base/sshmem_base_select.c @@ -10,9 +10,7 @@ #include "oshmem_config.h" -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #include "opal/constants.h" #include "opal/util/output.h" diff --git a/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c b/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c index 8cb3663c967..8d5ef386dbd 100644 --- a/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c +++ b/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c @@ -23,15 +23,11 @@ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ -#ifdef HAVE_TIME_H #include -#endif /* HAVE_NETDB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ diff --git a/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c b/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c index c66a99e8ef7..4c72c571cfe 100644 --- a/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c +++ b/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c @@ -18,9 +18,7 @@ #ifdef HAVE_SYS_MMAN_H #include #endif /* HAVE_SYS_MMAN_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c b/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c index 4819a783b1f..737051ea30b 100644 --- a/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c +++ b/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c @@ -33,9 +33,7 @@ #if HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ diff --git a/oshmem/mca/sshmem/verbs/sshmem_verbs_module.c b/oshmem/mca/sshmem/verbs/sshmem_verbs_module.c index 101293f5411..381e2781bd0 100644 --- a/oshmem/mca/sshmem/verbs/sshmem_verbs_module.c +++ b/oshmem/mca/sshmem/verbs/sshmem_verbs_module.c @@ -23,15 +23,11 @@ #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_STRING_H #include -#endif /* HAVE_STRING_H */ #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ -#ifdef HAVE_TIME_H #include -#endif /* HAVE_NETDB_H */ #ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ diff --git a/oshmem/tools/oshmem_info/oshmem_info.c b/oshmem/tools/oshmem_info/oshmem_info.c index 8c42fbfc372..38be24d4eb6 100644 --- a/oshmem/tools/oshmem_info/oshmem_info.c +++ b/oshmem/tools/oshmem_info/oshmem_info.c @@ -25,9 +25,7 @@ #include #endif #include -#ifdef HAVE_SIGNAL_H #include -#endif #include "opal/version.h" #include "opal/mca/installdirs/installdirs.h" diff --git a/test/class/ompi_rb_tree.c b/test/class/ompi_rb_tree.c index 32f9db37d0b..a13c0e055ec 100644 --- a/test/class/ompi_rb_tree.c +++ b/test/class/ompi_rb_tree.c @@ -21,9 +21,7 @@ */ #include "opal_config.h" -#ifdef HAVE_STDINT_H #include -#endif #ifdef HAVE_SYS_TIME_H #include #else diff --git a/test/class/opal_hash_table.c b/test/class/opal_hash_table.c index 8472716083c..e4f0e215f70 100644 --- a/test/class/opal_hash_table.c +++ b/test/class/opal_hash_table.c @@ -22,9 +22,7 @@ */ #include "opal_config.h" -#ifdef HAVE_STDINT_H #include -#endif #include #include "support.h" #include "opal/class/opal_object.h" diff --git a/test/class/opal_proc_table.c b/test/class/opal_proc_table.c index fe3a7f2fa13..644cc7b415f 100644 --- a/test/class/opal_proc_table.c +++ b/test/class/opal_proc_table.c @@ -24,9 +24,7 @@ */ #include "opal_config.h" -#ifdef HAVE_STDINT_H #include -#endif #include #include "support.h" #include "opal/class/opal_object.h" diff --git a/test/datatype/ddt_pack.c b/test/datatype/ddt_pack.c index 66d9636db3a..3439e16c409 100644 --- a/test/datatype/ddt_pack.c +++ b/test/datatype/ddt_pack.c @@ -25,12 +25,8 @@ #include "opal/datatype/opal_convertor.h" #include "ompi/proc/proc.h" -#ifdef HAVE_STDLIB_H #include -#endif -#ifdef HAVE_STRING_H #include -#endif #include diff --git a/test/datatype/opal_ddt_lib.c b/test/datatype/opal_ddt_lib.c index ce232cd5023..5fabd90a2b7 100644 --- a/test/datatype/opal_ddt_lib.c +++ b/test/datatype/opal_ddt_lib.c @@ -14,12 +14,9 @@ #include "opal_config.h" #include -#ifdef HAVE_STRING_H #include -#endif -#ifdef HAVE_TIME_H #include -#endif + #include "opal_ddt_lib.h" #include "opal/constants.h"