From d324a7725caa39cd988178f91f1b880acb8fc79f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 20 Oct 2004 01:03:09 +0000 Subject: [PATCH] - Add #if protection around non-portable system .h files - Add #include "ompi_config.h" to all .c files, and ensure that it's the first #included file - remove a few useless #if HAVE_CONFIG_H checks This commit was SVN r3229. --- src/class/ompi_free_list.c | 2 -- src/class/ompi_hash_table.c | 2 -- src/class/ompi_list.c | 2 -- src/class/ompi_object.c | 2 -- src/class/ompi_pointer_array.c | 2 -- src/class/ompi_rb_tree.c | 2 -- src/class/ompi_value_array.c | 2 -- src/communicator/comm_dyn.c | 2 ++ src/datatype/datatype.h | 6 +++++ src/datatype/ddt_test.c | 3 +++ src/datatype/dt_add.c | 1 + src/datatype/dt_create.c | 1 + src/datatype/dt_create_array.c | 1 + src/datatype/dt_create_dup.c | 1 + src/datatype/dt_create_indexed.c | 1 + src/datatype/dt_create_struct.c | 1 + src/datatype/dt_create_vector.c | 1 + src/datatype/dt_destroy.c | 1 + src/datatype/dt_module.c | 1 + src/errhandler/errhandler_predefined.c | 1 + src/event/WIN32-Code/win32.c | 6 +++++ src/event/compat/sys/_time.h | 2 ++ src/event/epoll.c | 8 +++++++ src/event/epoll_sub.c | 8 +++++++ src/event/event.c | 4 ++++ src/event/kqueue.c | 4 ++++ src/event/poll.c | 6 +++++ src/event/rtsig.c | 4 ++++ src/event/sample/event-test.c | 8 +++++++ src/event/sample/signal-test.c | 8 +++++++ src/event/sample/time-test.c | 8 +++++++ src/event/select.c | 4 ++++ src/event/signal.c | 4 ++++ src/event/test/bench.c | 10 +++++++++ src/event/test/regress.c | 8 +++++++ src/event/test/test-eof.c | 8 +++++++ src/event/test/test-init.c | 8 +++++++ src/event/test/test-time.c | 6 +++++ src/event/test/test-weof.c | 8 +++++++ src/group/group.c | 1 + src/group/mpi_group_init.c | 1 + src/group/mpi_set_group_rank.c | 1 + src/include/ompi.h | 4 ++++ src/include/types.h | 6 +++++ src/info/info.c | 1 + src/mca/allocator/bucket/allocator_bucket.c | 1 + .../allocator/bucket/allocator_bucket_alloc.c | 1 + src/mca/base/mca_base_module_exchange.c | 2 +- src/mca/common/sm/common_sm_mmap.c | 1 + src/mca/io/romio/src/io_romio_component.c | 1 + src/mca/io/romio/src/io_romio_file_read.c | 1 + src/mca/io/romio/src/io_romio_file_request.c | 1 + src/mca/io/romio/src/io_romio_file_write.c | 1 + src/mca/mpool/sm/mpool_sm_component.c | 1 + src/mca/mpool/sm/mpool_sm_module.c | 1 + src/mca/ns/replica/src/ns_replica.c | 2 +- src/mca/oob/cofs/src/oob_cofs.c | 2 +- src/mca/oob/tcp/oob_tcp.c | 1 + src/mca/oob/tcp/oob_tcp_msg.c | 1 + src/mca/oob/tcp/oob_tcp_peer.c | 1 + src/mca/oob/tcp/oob_tcp_ping.c | 1 + src/mca/oob/tcp/oob_tcp_recv.c | 1 + src/mca/oob/tcp/oob_tcp_send.c | 1 + src/mca/pml/base/pml_base_bsend.c | 1 + src/mca/pml/base/pml_base_recvreq.c | 1 + src/mca/pml/base/pml_base_request.c | 1 + src/mca/pml/base/pml_base_sendreq.c | 1 + src/mca/ptl/base/ptl_base_comm.c | 1 + src/mca/ptl/base/ptl_base_fragment.c | 1 + src/mca/ptl/base/ptl_base_match.c | 1 + src/mca/ptl/base/ptl_base_recvfrag.c | 1 + src/mca/ptl/base/ptl_base_sendfrag.c | 1 + src/mca/ptl/elan/src/ptl_elan.c | 1 + src/mca/ptl/elan/src/ptl_elan_comm_init.c | 1 + src/mca/ptl/elan/src/ptl_elan_component.c | 1 + src/mca/ptl/elan/src/ptl_elan_frag.c | 2 -- src/mca/ptl/elan/src/ptl_elan_init.c | 1 + src/mca/ptl/elan/src/ptl_elan_peer.c | 1 + src/mca/ptl/elan/src/ptl_elan_priv.c | 1 + src/mca/ptl/elan/tests/bw.c | 1 + src/mca/ptl/elan/tests/check.c | 1 + src/mca/ptl/elan/tests/check_bw.c | 1 + src/mca/ptl/elan/tests/init_elan.c | 1 + src/mca/ptl/elan/tests/lat.c | 1 + src/mca/ptl/elan/tests/mpi_test.c | 1 + src/mca/ptl/elan/tests/qsnet_init.c | 1 + src/mca/ptl/elan/tests/qsnet_qdma.c | 1 + src/mca/ptl/elan/tests/qsnet_rdma.c | 1 + src/mca/ptl/gm/src/ptl_gm.c | 1 + src/mca/ptl/gm/src/ptl_gm_component.c | 1 + src/mca/ptl/gm/src/ptl_gm_peer.c | 1 + src/mca/ptl/gm/src/ptl_gm_priv.c | 1 + src/mca/ptl/gm/src/ptl_gm_req.c | 1 + src/mca/ptl/gm/src/ptl_gm_sendfrag.c | 1 + src/mca/ptl/gm/tests/lat.c | 1 + src/mca/ptl/gm/tests/mpi-ping.c | 1 + src/mca/ptl/ib/src/ptl_ib.c | 1 + src/mca/ptl/ib/src/ptl_ib_component.c | 1 + src/mca/ptl/ib/src/ptl_ib_peer.c | 1 + src/mca/ptl/ib/src/ptl_ib_priv.c | 1 + src/mca/ptl/ib/src/ptl_ib_recvfrag.c | 1 + src/mca/ptl/ib/src/ptl_ib_sendfrag.c | 1 + src/mca/ptl/ib/src/ptl_ib_sendreq.c | 1 + src/mca/ptl/prof/ptl_prof.c | 1 + src/mca/ptl/prof/ptl_prof_component.c | 1 + src/mca/ptl/self/ptl_self.c | 1 + src/mca/ptl/self/ptl_self_component.c | 1 + src/mca/ptl/sm/src/ptl_sm_component.c | 1 + src/mca/ptl/sm/src/ptl_sm_frag.c | 1 + src/mca/ptl/sm/src/ptl_sm_recvfrag.c | 1 + src/mca/ptl/sm/src/ptl_sm_sendfrag.c | 1 + src/mca/ptl/sm/src/ptl_sm_sendreq.c | 1 + src/mca/ptl/tcp/src/ptl_tcp.c | 1 + src/mca/ptl/tcp/src/ptl_tcp_component.c | 1 + src/mca/ptl/tcp/src/ptl_tcp_peer.c | 1 + src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c | 1 + src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c | 1 + src/mca/ptl/tcp/src/ptl_tcp_sendreq.c | 1 + src/mca/svc/exec/svc_exec_component.c | 1 + src/mca/svc/sched/svc_sched_component.c | 1 + src/mca/svc/sched/svc_sched_node.c | 1 + src/mca/svc/stdio.old/cioapp.c | 1 + src/mca/svc/stdio.old/libcio.c | 1 + src/mca/svc/stdio.old/libsio.c | 1 + src/mca/svc/stdio.old/sioapp.c | 1 + src/mca/svc/stdio.old/snipe_lite/memory.c | 1 + src/mca/svc/stdio.old/snipe_lite/msg.c | 1 + src/mca/svc/stdio.old/snipe_lite/msgbuf2.c | 1 + src/mca/svc/stdio.old/snipe_lite/snipe_lite.c | 1 + src/mca/svc/stdio.old/snipe_lite/syslog.c | 1 + src/mca/svc/stdio/svc_stdio_component.c | 1 + src/mca/topo/base/topo_base_cart_coords.c | 1 + src/mca/topo/base/topo_base_cart_create.c | 1 + src/mca/topo/base/topo_base_cart_get.c | 1 + src/mca/topo/base/topo_base_cart_rank.c | 1 + src/mca/topo/base/topo_base_cart_shift.c | 1 + src/mca/topo/base/topo_base_cart_sub.c | 1 + src/mca/topo/base/topo_base_cartdim_get.c | 1 + src/mca/topo/base/topo_base_comm_unselect.c | 1 + src/mca/topo/base/topo_base_graph_create.c | 1 + src/mca/topo/base/topo_base_graph_get.c | 1 + src/mca/topo/base/topo_base_graph_neighbors.c | 1 + .../base/topo_base_graph_neighbors_count.c | 1 + src/mca/topo/base/topo_base_graphdims_get.c | 1 + src/mca/topo/unity/src/topo_unity_cart_map.c | 1 + src/mca/topo/unity/src/topo_unity_component.c | 1 + src/mca/topo/unity/src/topo_unity_graph_map.c | 1 + src/mpi/c/comm_join.c | 8 +++++++ src/mpi/c/error_string.c | 2 +- src/mpi/c/get_processor_name.c | 2 ++ src/mpi/c/wtime.c | 2 ++ src/op/op_predefined.c | 2 ++ src/proc/proc.c | 2 -- src/request/grequest.c | 1 + src/runtime/ompi_progress.c | 1 + src/runtime/ompi_rte_wait.c | 6 +++++ src/runtime/ompi_rte_wait.h | 2 ++ src/runtime/runtime.h | 2 ++ src/runtime/runtime_types.h | 4 ++++ src/runtime/universe_exists.c | 2 ++ src/threads/condition_pthread.c | 2 -- src/threads/condition_pthread.h | 2 ++ src/threads/condition_spinlock.c | 2 -- src/threads/condition_spinlock.h | 2 ++ src/threads/mutex.c | 2 -- src/threads/mutex_unix.h | 2 ++ src/threads/thread.c | 2 -- src/threads/thread.h | 2 ++ src/tools/bootproxy/bootproxy.c | 6 +++++ src/tools/mpirun/mpirun.c | 4 ++++ src/tools/ompid/ompid.c | 6 +++++ src/tools/openmpi/openmpi.c | 6 +++++ src/tools/openmpi/openmpi.h | 2 ++ src/util/argv.c | 1 + src/util/bufpack.c | 10 ++++++++- src/util/daemon_init.c | 4 ++++ src/util/few.c | 4 ++++ src/util/if.c | 17 ++++++++++++++ src/util/if.h | 4 ++++ src/util/os_create_dirpath.c | 4 ++++ src/util/os_create_dirpath.h | 2 ++ src/util/os_path.c | 6 +++++ src/util/output.c | 6 +++++ src/util/path.c | 4 +++- src/util/proc_info.c | 4 ++++ src/util/proc_info.h | 2 ++ src/util/pty.c | 4 ++++ src/util/session_dir.c | 22 ++++++++++++++++++- src/util/strncpy.h | 2 ++ src/util/sys_info.c | 8 ++++++- src/util/sys_info.h | 4 ++++ src/util/universe_setup_file_io.c | 4 ++++ src/win/win.c | 1 + src/win32/ompi_utsname.c | 1 + test/class/ompi_bitmap.c | 1 + test/class/ompi_circular_buffer_fifo.c | 1 + test/class/ompi_fifo.c | 1 + test/class/ompi_hash_table.c | 3 +++ test/class/ompi_list.c | 1 + test/class/ompi_pointer_array.c | 1 + test/class/ompi_rb_tree.c | 3 +++ test/class/ompi_value_array.c | 1 + test/include/atomic.c | 3 +++ test/mca/ns/test_ns_proxy.c | 2 +- test/mca/ns/test_ns_replica.c | 2 +- test/mca/oob/oob_test.c | 1 + test/mca/oob/oob_test_packed.c | 1 + test/mca/oob/oob_test_self.c | 1 + test/rte/ompi_session_dir.c | 8 ++++++- test/rte/sigchld.c | 5 +++++ test/support/support.c | 1 + test/threads/ompi_condition.c | 1 + test/threads/ompi_thread.c | 1 + test/util/ompi_argv.c | 2 +- test/util/ompi_os_create_dirpath.c | 6 ++++- test/util/ompi_os_path.c | 4 +++- test/util/ompi_pack.c | 6 ++++- test/util/ompi_session_dir.c | 8 ++++++- test/util/ompi_sys_info.c | 4 +++- 219 files changed, 492 insertions(+), 43 deletions(-) diff --git a/src/class/ompi_free_list.c b/src/class/ompi_free_list.c index 932a3489dc..54913abd46 100644 --- a/src/class/ompi_free_list.c +++ b/src/class/ompi_free_list.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "class/ompi_free_list.h" diff --git a/src/class/ompi_hash_table.c b/src/class/ompi_hash_table.c index 83e6a8849f..a6fb53f4f3 100644 --- a/src/class/ompi_hash_table.c +++ b/src/class/ompi_hash_table.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include #include diff --git a/src/class/ompi_list.c b/src/class/ompi_list.c index 625a5c30cb..55cd4ad4f5 100644 --- a/src/class/ompi_list.c +++ b/src/class/ompi_list.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "class/ompi_list.h" diff --git a/src/class/ompi_object.c b/src/class/ompi_object.c index 5c1863ea37..2782973d82 100644 --- a/src/class/ompi_object.c +++ b/src/class/ompi_object.c @@ -8,9 +8,7 @@ * Implementation of ompi_object_t, the base ompi foundation class */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include diff --git a/src/class/ompi_pointer_array.c b/src/class/ompi_pointer_array.c index 42c0324a79..0697a73e9a 100644 --- a/src/class/ompi_pointer_array.c +++ b/src/class/ompi_pointer_array.c @@ -7,9 +7,7 @@ * Utility functions to manage fortran <-> c opaque object translation */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include #include diff --git a/src/class/ompi_rb_tree.c b/src/class/ompi_rb_tree.c index abf4d9959f..7214dcb8e3 100644 --- a/src/class/ompi_rb_tree.c +++ b/src/class/ompi_rb_tree.c @@ -5,9 +5,7 @@ * @file */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "class/ompi_rb_tree.h" diff --git a/src/class/ompi_value_array.c b/src/class/ompi_value_array.c index 57bd4b6b25..2e943ae155 100644 --- a/src/class/ompi_value_array.c +++ b/src/class/ompi_value_array.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "class/ompi_value_array.h" diff --git a/src/communicator/comm_dyn.c b/src/communicator/comm_dyn.c index 3a4078ba41..c866dd5893 100644 --- a/src/communicator/comm_dyn.c +++ b/src/communicator/comm_dyn.c @@ -5,7 +5,9 @@ #include "ompi_config.h" #include #include +#ifdef HAVE_SYS_UIO_H #include +#endif #include "mpi.h" #include "communicator/communicator.h" diff --git a/src/datatype/datatype.h b/src/datatype/datatype.h index a8ffe31285..357e359755 100644 --- a/src/datatype/datatype.h +++ b/src/datatype/datatype.h @@ -12,9 +12,15 @@ #define DATATYPE_H_HAS_BEEN_INCLUDED #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_UIO_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include #include "include/constants.h" #include "class/ompi_object.h" diff --git a/src/datatype/ddt_test.c b/src/datatype/ddt_test.c index ba1b7c256f..aa485ce43d 100644 --- a/src/datatype/ddt_test.c +++ b/src/datatype/ddt_test.c @@ -1,10 +1,13 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" #include "datatype_internal.h" #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #define TIMER_DATA_TYPE struct timeval diff --git a/src/datatype/dt_add.c b/src/datatype/dt_add.c index 7384bb071a..8379fe478a 100644 --- a/src/datatype/dt_add.c +++ b/src/datatype/dt_add.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" #include "datatype_internal.h" diff --git a/src/datatype/dt_create.c b/src/datatype/dt_create.c index eba2f2b1a7..2661d7947a 100644 --- a/src/datatype/dt_create.c +++ b/src/datatype/dt_create.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" #include "datatype_internal.h" #include "limits.h" diff --git a/src/datatype/dt_create_array.c b/src/datatype/dt_create_array.c index 85916dc905..bbe136e006 100644 --- a/src/datatype/dt_create_array.c +++ b/src/datatype/dt_create_array.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" int ompi_ddt_create_subarray( int ndims, int* pSizes, int* pSubSizes, int* pStarts, diff --git a/src/datatype/dt_create_dup.c b/src/datatype/dt_create_dup.c index 0788288d3a..3b9b702f2a 100644 --- a/src/datatype/dt_create_dup.c +++ b/src/datatype/dt_create_dup.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" #include "datatype_internal.h" diff --git a/src/datatype/dt_create_indexed.c b/src/datatype/dt_create_indexed.c index 22f1930918..2aa5ab313b 100644 --- a/src/datatype/dt_create_indexed.c +++ b/src/datatype/dt_create_indexed.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" /* We try to merge together data that are contiguous */ diff --git a/src/datatype/dt_create_struct.c b/src/datatype/dt_create_struct.c index c0fb406e97..b93e56fecf 100644 --- a/src/datatype/dt_create_struct.c +++ b/src/datatype/dt_create_struct.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" int ompi_ddt_create_struct( int count, int* pBlockLength, long* pDisp, diff --git a/src/datatype/dt_create_vector.c b/src/datatype/dt_create_vector.c index 71bcab63bc..f4105aa137 100644 --- a/src/datatype/dt_create_vector.c +++ b/src/datatype/dt_create_vector.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" /* Open questions ... diff --git a/src/datatype/dt_destroy.c b/src/datatype/dt_destroy.c index f638a6426e..42acd1b581 100644 --- a/src/datatype/dt_destroy.c +++ b/src/datatype/dt_destroy.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" #include "datatype_internal.h" diff --git a/src/datatype/dt_module.c b/src/datatype/dt_module.c index 94d09c3503..17e25ed7bc 100644 --- a/src/datatype/dt_module.c +++ b/src/datatype/dt_module.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ +#include "ompi_config.h" #include "datatype.h" #include "datatype_internal.h" diff --git a/src/errhandler/errhandler_predefined.c b/src/errhandler/errhandler_predefined.c index 4b98a05e47..3ec537f990 100644 --- a/src/errhandler/errhandler_predefined.c +++ b/src/errhandler/errhandler_predefined.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include diff --git a/src/event/WIN32-Code/win32.c b/src/event/WIN32-Code/win32.c index 6bcf4bc93d..e22f395a61 100644 --- a/src/event/WIN32-Code/win32.c +++ b/src/event/WIN32-Code/win32.c @@ -28,14 +28,20 @@ #include "config.h" #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_QUEUE_H #include +#endif #include #include #include #include #include +#ifdef HAVE_ERR_H #include +#endif #ifdef USE_LOG #include "log.h" diff --git a/src/event/compat/sys/_time.h b/src/event/compat/sys/_time.h index 8cabb0d55e..9415f7ad44 100644 --- a/src/event/compat/sys/_time.h +++ b/src/event/compat/sys/_time.h @@ -35,7 +35,9 @@ #ifndef _SYS_TIME_H_ #define _SYS_TIME_H_ +#ifdef HAVE_SYS_TYPES_H #include +#endif /* * Structure returned by gettimeofday(2) system call, diff --git a/src/event/epoll.c b/src/event/epoll.c index bc8ebb4760..9fa6c8b050 100644 --- a/src/event/epoll.c +++ b/src/event/epoll.c @@ -26,9 +26,15 @@ */ #include "ompi_config.h" +#ifdef HAVE_STDINT_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_RESOURCE_H #include +#endif #ifdef HAVE_SYS_TIME_H #include #else @@ -40,7 +46,9 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/epoll_sub.c b/src/event/epoll_sub.c index 431970c73a..a55c5f124a 100644 --- a/src/event/epoll_sub.c +++ b/src/event/epoll_sub.c @@ -24,13 +24,21 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_STDINT_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #include +#ifdef HAVE_UNISTD_H #include +#endif int epoll_create(int size) diff --git a/src/event/event.c b/src/event/event.c index 0210c80471..e7c5f1478b 100644 --- a/src/event/event.c +++ b/src/event/event.c @@ -34,7 +34,9 @@ #undef WIN32_LEAN_AND_MEAN #include "misc.h" #endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #ifdef HAVE_SYS_TIME_H #include @@ -45,8 +47,10 @@ #include #include #ifndef WIN32 +#ifdef HAVE_UNISTD_H #include #endif +#endif #include #include #include diff --git a/src/event/kqueue.c b/src/event/kqueue.c index 83ba08d42d..20fd9c8a0e 100644 --- a/src/event/kqueue.c +++ b/src/event/kqueue.c @@ -28,7 +28,9 @@ */ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #ifdef HAVE_SYS_TIME_H #include #else @@ -40,7 +42,9 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include #ifdef HAVE_INTTYPES_H diff --git a/src/event/poll.c b/src/event/poll.c index f663b3bc4d..e736a24f4f 100644 --- a/src/event/poll.c +++ b/src/event/poll.c @@ -28,19 +28,25 @@ */ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #ifdef HAVE_SYS_TIME_H #include #else #include #endif #include +#ifdef HAVE_POLL_H #include +#endif #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/rtsig.c b/src/event/rtsig.c index 703d744d0d..ccef16fe51 100644 --- a/src/event/rtsig.c +++ b/src/event/rtsig.c @@ -3,7 +3,9 @@ /* Enable F_SETSIG and F_SETOWN */ #define _GNU_SOURCE +#ifdef HAVE_SYS_TYPES_H #include +#endif #ifdef HAVE_SYS_TIME_H #include #else @@ -21,7 +23,9 @@ #ifndef HAVE_WORKING_RTSIG #include #endif +#ifdef HAVE_UNISTD_H #include +#endif #define EVLIST_X_NORT 0x1000 /* Skip RT signals (internal) */ diff --git a/src/event/sample/event-test.c b/src/event/sample/event-test.c index 110cda7477..f952dfcf4c 100644 --- a/src/event/sample/event-test.c +++ b/src/event/sample/event-test.c @@ -3,12 +3,20 @@ * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #ifndef WIN32 +#ifdef HAVE_SYS_QUEUE_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_TIME_H #include +#endif #else #include #endif diff --git a/src/event/sample/signal-test.c b/src/event/sample/signal-test.c index d57b7fa719..42acdfda17 100644 --- a/src/event/sample/signal-test.c +++ b/src/event/sample/signal-test.c @@ -3,12 +3,20 @@ * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #ifndef WIN32 +#ifdef HAVE_SYS_QUEUE_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_TIME_H #include +#endif #else #include #endif diff --git a/src/event/sample/time-test.c b/src/event/sample/time-test.c index f3927b1455..9184354707 100644 --- a/src/event/sample/time-test.c +++ b/src/event/sample/time-test.c @@ -3,15 +3,23 @@ * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #ifndef WIN32 +#ifdef HAVE_SYS_QUEUE_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #else #include #endif +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include #include diff --git a/src/event/select.c b/src/event/select.c index fe5637d9e8..a1c4ba2ac1 100644 --- a/src/event/select.c +++ b/src/event/select.c @@ -29,7 +29,9 @@ #include "ompi_config.h" #include "util/output.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #ifdef HAVE_SYS_TIME_H #include #else @@ -40,7 +42,9 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include #include "mca/oob/base/base.h" diff --git a/src/event/signal.c b/src/event/signal.c index d154cc2bef..508146a9a8 100644 --- a/src/event/signal.c +++ b/src/event/signal.c @@ -28,7 +28,9 @@ */ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #ifdef HAVE_SYS_TIME_H #include #else @@ -39,7 +41,9 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/test/bench.c b/src/event/test/bench.c index d7cda2c408..7f0ab9b168 100644 --- a/src/event/test/bench.c +++ b/src/event/test/bench.c @@ -37,17 +37,27 @@ #include "config.h" #endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include +#ifdef HAVE_SYS_RESOURCE_H #include +#endif #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/test/regress.c b/src/event/test/regress.c index 86be6d3db5..3899da5f7c 100644 --- a/src/event/test/regress.c +++ b/src/event/test/regress.c @@ -29,16 +29,24 @@ #include "config.h" #endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/test/test-eof.c b/src/event/test/test-eof.c index 0708131744..193b1c56c5 100644 --- a/src/event/test/test-eof.c +++ b/src/event/test/test-eof.c @@ -3,15 +3,23 @@ * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/test/test-init.c b/src/event/test/test-init.c index dae70292eb..54ab9f60e2 100644 --- a/src/event/test/test-init.c +++ b/src/event/test/test-init.c @@ -3,15 +3,23 @@ * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/test/test-time.c b/src/event/test/test-time.c index 0c29f31c21..c62017d246 100644 --- a/src/event/test/test-time.c +++ b/src/event/test/test-time.c @@ -3,14 +3,20 @@ * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/event/test/test-weof.c b/src/event/test/test-weof.c index 3749a5a2c7..1561619644 100644 --- a/src/event/test/test-weof.c +++ b/src/event/test/test-weof.c @@ -3,16 +3,24 @@ * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/src/group/group.c b/src/group/group.c index 3c759be17c..4647e22a97 100644 --- a/src/group/group.c +++ b/src/group/group.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "group/group.h" #include "include/constants.h" #include "mpi.h" diff --git a/src/group/mpi_group_init.c b/src/group/mpi_group_init.c index 79c341d52a..840ec30c91 100644 --- a/src/group/mpi_group_init.c +++ b/src/group/mpi_group_init.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "group/group.h" #include "include/constants.h" #include "mpi.h" diff --git a/src/group/mpi_set_group_rank.c b/src/group/mpi_set_group_rank.c index 44824ae6cc..feb02ee790 100644 --- a/src/group/mpi_set_group_rank.c +++ b/src/group/mpi_set_group_rank.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "group/group.h" #include "include/constants.h" diff --git a/src/include/ompi.h b/src/include/ompi.h index 09505b7d1e..b2d54b69c0 100644 --- a/src/include/ompi.h +++ b/src/include/ompi.h @@ -5,8 +5,12 @@ #ifndef OMPI_H #define OMPI_H +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include "ompi_config.h" #include "types.h" diff --git a/src/include/types.h b/src/include/types.h index 3bda047878..6414a10843 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5,9 +5,15 @@ #ifndef OMPI_TYPES_H #define OMPI_TYPES_H +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_SYS_SELECT_H #include +#endif #include "ompi_config.h" /* diff --git a/src/info/info.c b/src/info/info.c index 3a361ebd04..0dc2b50e17 100644 --- a/src/info/info.c +++ b/src/info/info.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "info/info.h" #include "include/constants.h" #include "mpi/runtime/params.h" diff --git a/src/mca/allocator/bucket/allocator_bucket.c b/src/mca/allocator/bucket/allocator_bucket.c index e0a8cac044..2b79b5f1d0 100644 --- a/src/mca/allocator/bucket/allocator_bucket.c +++ b/src/mca/allocator/bucket/allocator_bucket.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "mca/allocator/allocator.h" #include "include/constants.h" #include "mca/base/mca_base_param.h" diff --git a/src/mca/allocator/bucket/allocator_bucket_alloc.c b/src/mca/allocator/bucket/allocator_bucket_alloc.c index 8d52dc26b3..64dafa97d6 100644 --- a/src/mca/allocator/bucket/allocator_bucket_alloc.c +++ b/src/mca/allocator/bucket/allocator_bucket_alloc.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "include/constants.h" #include "mca/allocator/bucket/allocator_bucket_alloc.h" /** diff --git a/src/mca/base/mca_base_module_exchange.c b/src/mca/base/mca_base_module_exchange.c index da488a1eb6..14f26b8df4 100644 --- a/src/mca/base/mca_base_module_exchange.c +++ b/src/mca/base/mca_base_module_exchange.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include #include "ompi_config.h" +#include #include "class/ompi_hash_table.h" #include "threads/condition.h" #include "util/proc_info.h" diff --git a/src/mca/common/sm/common_sm_mmap.c b/src/mca/common/sm/common_sm_mmap.c index 51c24fcff9..9abfda28bf 100644 --- a/src/mca/common/sm/common_sm_mmap.c +++ b/src/mca/common/sm/common_sm_mmap.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/io/romio/src/io_romio_component.c b/src/mca/io/romio/src/io_romio_component.c index 00bef0a08c..650a510d86 100644 --- a/src/mca/io/romio/src/io_romio_component.c +++ b/src/mca/io/romio/src/io_romio_component.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mpi.h" #include "mca/io/io.h" #include "io_romio.h" diff --git a/src/mca/io/romio/src/io_romio_file_read.c b/src/mca/io/romio/src/io_romio_file_read.c index 260b2b3cc1..d7f2992885 100644 --- a/src/mca/io/romio/src/io_romio_file_read.c +++ b/src/mca/io/romio/src/io_romio_file_read.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mpi.h" #include "file/file.h" #include "request/request.h" diff --git a/src/mca/io/romio/src/io_romio_file_request.c b/src/mca/io/romio/src/io_romio_file_request.c index d76eb75271..dd7b978472 100644 --- a/src/mca/io/romio/src/io_romio_file_request.c +++ b/src/mca/io/romio/src/io_romio_file_request.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mpi.h" #include "file/file.h" #include "request/request.h" diff --git a/src/mca/io/romio/src/io_romio_file_write.c b/src/mca/io/romio/src/io_romio_file_write.c index 0e725cd991..cdf8f8a800 100644 --- a/src/mca/io/romio/src/io_romio_file_write.c +++ b/src/mca/io/romio/src/io_romio_file_write.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mpi.h" #include "file/file.h" #include "io_romio.h" diff --git a/src/mca/mpool/sm/mpool_sm_component.c b/src/mca/mpool/sm/mpool_sm_component.c index a296b12279..baa70da90b 100644 --- a/src/mca/mpool/sm/mpool_sm_component.c +++ b/src/mca/mpool/sm/mpool_sm_component.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "util/output.h" #include "mca/base/base.h" #include "mca/base/mca_base_param.h" diff --git a/src/mca/mpool/sm/mpool_sm_module.c b/src/mca/mpool/sm/mpool_sm_module.c index 42f02287f0..2f5c9453f3 100644 --- a/src/mca/mpool/sm/mpool_sm_module.c +++ b/src/mca/mpool/sm/mpool_sm_module.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "util/output.h" #include "mca/mpool/sm/mpool_sm.h" diff --git a/src/mca/ns/replica/src/ns_replica.c b/src/mca/ns/replica/src/ns_replica.c index 2c428a3953..7008a25582 100644 --- a/src/mca/ns/replica/src/ns_replica.c +++ b/src/mca/ns/replica/src/ns_replica.c @@ -4,11 +4,11 @@ /** @file: * */ +#include "ompi_config.h" #include #include "threads/mutex.h" -#include "ompi_config.h" #include "util/output.h" #include "mca/mca.h" #include "mca/ns/base/base.h" diff --git a/src/mca/oob/cofs/src/oob_cofs.c b/src/mca/oob/cofs/src/oob_cofs.c index ae26489266..6f358a2109 100644 --- a/src/mca/oob/cofs/src/oob_cofs.c +++ b/src/mca/oob/cofs/src/oob_cofs.c @@ -4,10 +4,10 @@ * */ +#include "ompi_config.h" #include #include #include -#include "ompi_config.h" #include "include/types.h" #include "include/constants.h" diff --git a/src/mca/oob/tcp/oob_tcp.c b/src/mca/oob/tcp/oob_tcp.c index b077b747be..387712daf1 100644 --- a/src/mca/oob/tcp/oob_tcp.c +++ b/src/mca/oob/tcp/oob_tcp.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/oob/tcp/oob_tcp_msg.c b/src/mca/oob/tcp/oob_tcp_msg.c index b2e0c06c5e..d1fe3753ac 100644 --- a/src/mca/oob/tcp/oob_tcp_msg.c +++ b/src/mca/oob/tcp/oob_tcp_msg.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include "mca/oob/tcp/oob_tcp.h" #include "mca/oob/tcp/oob_tcp_msg.h" diff --git a/src/mca/oob/tcp/oob_tcp_peer.c b/src/mca/oob/tcp/oob_tcp_peer.c index 46eb68e65d..b57f935050 100644 --- a/src/mca/oob/tcp/oob_tcp_peer.c +++ b/src/mca/oob/tcp/oob_tcp_peer.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/oob/tcp/oob_tcp_ping.c b/src/mca/oob/tcp/oob_tcp_ping.c index bb56ed6420..2019d08fd9 100644 --- a/src/mca/oob/tcp/oob_tcp_ping.c +++ b/src/mca/oob/tcp/oob_tcp_ping.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include "mca/oob/tcp/oob_tcp.h" /* diff --git a/src/mca/oob/tcp/oob_tcp_recv.c b/src/mca/oob/tcp/oob_tcp_recv.c index fa8cb91826..6f2f10b86a 100644 --- a/src/mca/oob/tcp/oob_tcp_recv.c +++ b/src/mca/oob/tcp/oob_tcp_recv.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include "mca/oob/tcp/oob_tcp.h" /* diff --git a/src/mca/oob/tcp/oob_tcp_send.c b/src/mca/oob/tcp/oob_tcp_send.c index e7392912ec..cead0c7b76 100644 --- a/src/mca/oob/tcp/oob_tcp_send.c +++ b/src/mca/oob/tcp/oob_tcp_send.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include "mca/oob/tcp/oob_tcp.h" /* diff --git a/src/mca/pml/base/pml_base_bsend.c b/src/mca/pml/base/pml_base_bsend.c index 7de1907bd4..d3a715b97a 100644 --- a/src/mca/pml/base/pml_base_bsend.c +++ b/src/mca/pml/base/pml_base_bsend.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "threads/mutex.h" #include "threads/condition.h" #include "mca/allocator/base/base.h" diff --git a/src/mca/pml/base/pml_base_recvreq.c b/src/mca/pml/base/pml_base_recvreq.c index 2464224c54..563bd53231 100644 --- a/src/mca/pml/base/pml_base_recvreq.c +++ b/src/mca/pml/base/pml_base_recvreq.c @@ -3,6 +3,7 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include "ompi_config.h" #include "include/types.h" #include "mca/pml/base/pml_base_recvreq.h" diff --git a/src/mca/pml/base/pml_base_request.c b/src/mca/pml/base/pml_base_request.c index 3fe0c4e12f..459af3da64 100644 --- a/src/mca/pml/base/pml_base_request.c +++ b/src/mca/pml/base/pml_base_request.c @@ -3,6 +3,7 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include "ompi_config.h" #include "mca/pml/base/pml_base_request.h" static void mca_pml_base_request_construct(mca_pml_base_request_t* req) diff --git a/src/mca/pml/base/pml_base_sendreq.c b/src/mca/pml/base/pml_base_sendreq.c index 6d940dcb97..49730d008c 100644 --- a/src/mca/pml/base/pml_base_sendreq.c +++ b/src/mca/pml/base/pml_base_sendreq.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include "mca/pml/base/pml_base_sendreq.h" diff --git a/src/mca/ptl/base/ptl_base_comm.c b/src/mca/ptl/base/ptl_base_comm.c index 77ac7f80a0..b411a498a8 100644 --- a/src/mca/ptl/base/ptl_base_comm.c +++ b/src/mca/ptl/base/ptl_base_comm.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "ptl_base_comm.h" diff --git a/src/mca/ptl/base/ptl_base_fragment.c b/src/mca/ptl/base/ptl_base_fragment.c index 00167b6daf..dde75c0927 100644 --- a/src/mca/ptl/base/ptl_base_fragment.c +++ b/src/mca/ptl/base/ptl_base_fragment.c @@ -3,6 +3,7 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include "ompi_config.h" #include "class/ompi_list.h" #include "mca/ptl/base/ptl_base_fragment.h" diff --git a/src/mca/ptl/base/ptl_base_match.c b/src/mca/ptl/base/ptl_base_match.c index df08bca738..5402031e15 100644 --- a/src/mca/ptl/base/ptl_base_match.c +++ b/src/mca/ptl/base/ptl_base_match.c @@ -4,6 +4,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "class/ompi_list.h" diff --git a/src/mca/ptl/base/ptl_base_recvfrag.c b/src/mca/ptl/base/ptl_base_recvfrag.c index 280f1892e1..58ce4a105b 100644 --- a/src/mca/ptl/base/ptl_base_recvfrag.c +++ b/src/mca/ptl/base/ptl_base_recvfrag.c @@ -3,6 +3,7 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include "ompi_config.h" #include "mca/ptl/ptl.h" #include "mca/ptl/base/ptl_base_recvfrag.h" #include "mca/ptl/base/ptl_base_match.h" diff --git a/src/mca/ptl/base/ptl_base_sendfrag.c b/src/mca/ptl/base/ptl_base_sendfrag.c index 22cfb1661e..c7ae5c5a0a 100644 --- a/src/mca/ptl/base/ptl_base_sendfrag.c +++ b/src/mca/ptl/base/ptl_base_sendfrag.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/ptl/base/ptl_base_sendfrag.h" static void mca_ptl_base_send_frag_construct(mca_ptl_base_send_frag_t* frag); diff --git a/src/mca/ptl/elan/src/ptl_elan.c b/src/mca/ptl/elan/src/ptl_elan.c index 668ff000e4..84152acfc3 100644 --- a/src/mca/ptl/elan/src/ptl_elan.c +++ b/src/mca/ptl/elan/src/ptl_elan.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "util/output.h" #include "util/if.h" diff --git a/src/mca/ptl/elan/src/ptl_elan_comm_init.c b/src/mca/ptl/elan/src/ptl_elan_comm_init.c index 0ec671c23a..0b70341782 100644 --- a/src/mca/ptl/elan/src/ptl_elan_comm_init.c +++ b/src/mca/ptl/elan/src/ptl_elan_comm_init.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/src/ptl_elan_component.c b/src/mca/ptl/elan/src/ptl_elan_component.c index b4d6e9e035..b7a3653048 100644 --- a/src/mca/ptl/elan/src/ptl_elan_component.c +++ b/src/mca/ptl/elan/src/ptl_elan_component.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/src/ptl_elan_frag.c b/src/mca/ptl/elan/src/ptl_elan_frag.c index 2b01b9808f..f7e10ca081 100644 --- a/src/mca/ptl/elan/src/ptl_elan_frag.c +++ b/src/mca/ptl/elan/src/ptl_elan_frag.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include #include diff --git a/src/mca/ptl/elan/src/ptl_elan_init.c b/src/mca/ptl/elan/src/ptl_elan_init.c index 50bd00328a..e8ca72d2f6 100644 --- a/src/mca/ptl/elan/src/ptl_elan_init.c +++ b/src/mca/ptl/elan/src/ptl_elan_init.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/src/ptl_elan_peer.c b/src/mca/ptl/elan/src/ptl_elan_peer.c index 98dfc6b828..3422b29e47 100644 --- a/src/mca/ptl/elan/src/ptl_elan_peer.c +++ b/src/mca/ptl/elan/src/ptl_elan_peer.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.c b/src/mca/ptl/elan/src/ptl_elan_priv.c index dd0ed3d768..3a1f8a0597 100644 --- a/src/mca/ptl/elan/src/ptl_elan_priv.c +++ b/src/mca/ptl/elan/src/ptl_elan_priv.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/tests/bw.c b/src/mca/ptl/elan/tests/bw.c index ba24d43a46..fc0798ccbb 100644 --- a/src/mca/ptl/elan/tests/bw.c +++ b/src/mca/ptl/elan/tests/bw.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "mpi.h" #include #include diff --git a/src/mca/ptl/elan/tests/check.c b/src/mca/ptl/elan/tests/check.c index 0bec734067..5fdebda591 100644 --- a/src/mca/ptl/elan/tests/check.c +++ b/src/mca/ptl/elan/tests/check.c @@ -1,4 +1,5 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/tests/check_bw.c b/src/mca/ptl/elan/tests/check_bw.c index 5f2129c4ea..1daa6db713 100644 --- a/src/mca/ptl/elan/tests/check_bw.c +++ b/src/mca/ptl/elan/tests/check_bw.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "mpi.h" #include #include diff --git a/src/mca/ptl/elan/tests/init_elan.c b/src/mca/ptl/elan/tests/init_elan.c index 0c9d888d9e..9f2b0ce9a2 100644 --- a/src/mca/ptl/elan/tests/init_elan.c +++ b/src/mca/ptl/elan/tests/init_elan.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/tests/lat.c b/src/mca/ptl/elan/tests/lat.c index 9f05891df1..0547e47dd3 100644 --- a/src/mca/ptl/elan/tests/lat.c +++ b/src/mca/ptl/elan/tests/lat.c @@ -1,4 +1,5 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/elan/tests/mpi_test.c b/src/mca/ptl/elan/tests/mpi_test.c index 8930ce2c4f..f085b1e7e6 100644 --- a/src/mca/ptl/elan/tests/mpi_test.c +++ b/src/mca/ptl/elan/tests/mpi_test.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include "mpi.h" #include "test_util.h" diff --git a/src/mca/ptl/elan/tests/qsnet_init.c b/src/mca/ptl/elan/tests/qsnet_init.c index 539e3cfd59..e03b088912 100644 --- a/src/mca/ptl/elan/tests/qsnet_init.c +++ b/src/mca/ptl/elan/tests/qsnet_init.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include "qsnet/fence.h" #include "ptl_elan.h" diff --git a/src/mca/ptl/elan/tests/qsnet_qdma.c b/src/mca/ptl/elan/tests/qsnet_qdma.c index af541bd0e1..49e8b3efe9 100644 --- a/src/mca/ptl/elan/tests/qsnet_qdma.c +++ b/src/mca/ptl/elan/tests/qsnet_qdma.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "qsnet/fence.h" #include "ptl_elan.h" #include "ptl_elan_priv.h" diff --git a/src/mca/ptl/elan/tests/qsnet_rdma.c b/src/mca/ptl/elan/tests/qsnet_rdma.c index c748152e67..7db133abc6 100644 --- a/src/mca/ptl/elan/tests/qsnet_rdma.c +++ b/src/mca/ptl/elan/tests/qsnet_rdma.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "qsnet/fence.h" #include "ptl_elan.h" #include "ptl_elan_priv.h" diff --git a/src/mca/ptl/gm/src/ptl_gm.c b/src/mca/ptl/gm/src/ptl_gm.c index 502a763a6f..e3b296e5c2 100644 --- a/src/mca/ptl/gm/src/ptl_gm.c +++ b/src/mca/ptl/gm/src/ptl_gm.c @@ -4,6 +4,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "util/output.h" #include "util/if.h" diff --git a/src/mca/ptl/gm/src/ptl_gm_component.c b/src/mca/ptl/gm/src/ptl_gm_component.c index 344c9679c7..220190a5f5 100644 --- a/src/mca/ptl/gm/src/ptl_gm_component.c +++ b/src/mca/ptl/gm/src/ptl_gm_component.c @@ -3,6 +3,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/gm/src/ptl_gm_peer.c b/src/mca/ptl/gm/src/ptl_gm_peer.c index 976a8a7041..67dc39cfbb 100755 --- a/src/mca/ptl/gm/src/ptl_gm_peer.c +++ b/src/mca/ptl/gm/src/ptl_gm_peer.c @@ -3,6 +3,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/gm/src/ptl_gm_priv.c b/src/mca/ptl/gm/src/ptl_gm_priv.c index ac7db11015..76a8626281 100755 --- a/src/mca/ptl/gm/src/ptl_gm_priv.c +++ b/src/mca/ptl/gm/src/ptl_gm_priv.c @@ -3,6 +3,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/gm/src/ptl_gm_req.c b/src/mca/ptl/gm/src/ptl_gm_req.c index 9a5285df51..afadd6496e 100644 --- a/src/mca/ptl/gm/src/ptl_gm_req.c +++ b/src/mca/ptl/gm/src/ptl_gm_req.c @@ -1,6 +1,7 @@ /* *HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/gm/src/ptl_gm_sendfrag.c b/src/mca/ptl/gm/src/ptl_gm_sendfrag.c index ade86bfe6a..b4ef9afddb 100644 --- a/src/mca/ptl/gm/src/ptl_gm_sendfrag.c +++ b/src/mca/ptl/gm/src/ptl_gm_sendfrag.c @@ -3,6 +3,7 @@ /* *HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/gm/tests/lat.c b/src/mca/ptl/gm/tests/lat.c index 419a301034..060072206d 100644 --- a/src/mca/ptl/gm/tests/lat.c +++ b/src/mca/ptl/gm/tests/lat.c @@ -1,4 +1,5 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/gm/tests/mpi-ping.c b/src/mca/ptl/gm/tests/mpi-ping.c index c5217c7921..baf20abfd5 100644 --- a/src/mca/ptl/gm/tests/mpi-ping.c +++ b/src/mca/ptl/gm/tests/mpi-ping.c @@ -4,6 +4,7 @@ * Patterned after the example in the Quadrics documentation */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/ib/src/ptl_ib.c b/src/mca/ptl/ib/src/ptl_ib.c index 17b4adc42e..2493d92943 100644 --- a/src/mca/ptl/ib/src/ptl_ib.c +++ b/src/mca/ptl/ib/src/ptl_ib.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "util/output.h" #include "util/if.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_component.c b/src/mca/ptl/ib/src/ptl_ib_component.c index e5e2231bb2..950d06aacb 100644 --- a/src/mca/ptl/ib/src/ptl_ib_component.c +++ b/src/mca/ptl/ib/src/ptl_ib_component.c @@ -3,6 +3,7 @@ */ /* Open MPI includes */ +#include "ompi_config.h" #include "include/constants.h" #include "event/event.h" #include "util/if.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_peer.c b/src/mca/ptl/ib/src/ptl_ib_peer.c index 415e686286..d86d4a014b 100644 --- a/src/mca/ptl/ib/src/ptl_ib_peer.c +++ b/src/mca/ptl/ib/src/ptl_ib_peer.c @@ -1,4 +1,5 @@ +#include "ompi_config.h" #include #include #include "include/types.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_priv.c b/src/mca/ptl/ib/src/ptl_ib_priv.c index ae5fb5acba..51e3c27d2c 100644 --- a/src/mca/ptl/ib/src/ptl_ib_priv.c +++ b/src/mca/ptl/ib/src/ptl_ib_priv.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "ptl_ib_vapi.h" #include "ptl_ib_priv.h" #include "ptl_ib.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_recvfrag.c b/src/mca/ptl/ib/src/ptl_ib_recvfrag.c index 4a5a290b67..f88d540d27 100644 --- a/src/mca/ptl/ib/src/ptl_ib_recvfrag.c +++ b/src/mca/ptl/ib/src/ptl_ib_recvfrag.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "mca/pml/base/pml_base_sendreq.h" #include "ptl_ib.h" #include "ptl_ib_peer.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_sendfrag.c b/src/mca/ptl/ib/src/ptl_ib_sendfrag.c index 297bb51a51..b62a9bbf13 100644 --- a/src/mca/ptl/ib/src/ptl_ib_sendfrag.c +++ b/src/mca/ptl/ib/src/ptl_ib_sendfrag.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "include/types.h" #include "datatype/datatype.h" #include "mca/pml/base/pml_base_sendreq.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_sendreq.c b/src/mca/ptl/ib/src/ptl_ib_sendreq.c index cdde74ff9d..ef22f3d331 100644 --- a/src/mca/ptl/ib/src/ptl_ib_sendreq.c +++ b/src/mca/ptl/ib/src/ptl_ib_sendreq.c @@ -1,4 +1,5 @@ +#include "ompi_config.h" #include "include/types.h" #include "mca/pml/base/pml_base_sendreq.h" #include "ptl_ib.h" diff --git a/src/mca/ptl/prof/ptl_prof.c b/src/mca/ptl/prof/ptl_prof.c index 7b2e704f99..65b92a6647 100644 --- a/src/mca/ptl/prof/ptl_prof.c +++ b/src/mca/ptl/prof/ptl_prof.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "ptl_prof.h" static int ptl_prof_add_procs_fn( struct mca_ptl_base_module_t* ptl, diff --git a/src/mca/ptl/prof/ptl_prof_component.c b/src/mca/ptl/prof/ptl_prof_component.c index 5ef562c877..93dbf97682 100644 --- a/src/mca/ptl/prof/ptl_prof_component.c +++ b/src/mca/ptl/prof/ptl_prof_component.c @@ -2,6 +2,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/self/ptl_self.c b/src/mca/ptl/self/ptl_self.c index 63072619a3..4201e749e6 100644 --- a/src/mca/ptl/self/ptl_self.c +++ b/src/mca/ptl/self/ptl_self.c @@ -2,6 +2,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/self/ptl_self_component.c b/src/mca/ptl/self/ptl_self_component.c index 8c577cde99..45ac60856e 100644 --- a/src/mca/ptl/self/ptl_self_component.c +++ b/src/mca/ptl/self/ptl_self_component.c @@ -2,6 +2,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/sm/src/ptl_sm_component.c b/src/mca/ptl/sm/src/ptl_sm_component.c index b5f213823f..7c36c66161 100644 --- a/src/mca/ptl/sm/src/ptl_sm_component.c +++ b/src/mca/ptl/sm/src/ptl_sm_component.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/sm/src/ptl_sm_frag.c b/src/mca/ptl/sm/src/ptl_sm_frag.c index b759883379..884864566e 100644 --- a/src/mca/ptl/sm/src/ptl_sm_frag.c +++ b/src/mca/ptl/sm/src/ptl_sm_frag.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/sm/src/ptl_sm_recvfrag.c b/src/mca/ptl/sm/src/ptl_sm_recvfrag.c index 877ab1182c..638d6b4cb8 100644 --- a/src/mca/ptl/sm/src/ptl_sm_recvfrag.c +++ b/src/mca/ptl/sm/src/ptl_sm_recvfrag.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/sm/src/ptl_sm_sendfrag.c b/src/mca/ptl/sm/src/ptl_sm_sendfrag.c index 023001222d..cd20ed02a2 100644 --- a/src/mca/ptl/sm/src/ptl_sm_sendfrag.c +++ b/src/mca/ptl/sm/src/ptl_sm_sendfrag.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/sm/src/ptl_sm_sendreq.c b/src/mca/ptl/sm/src/ptl_sm_sendreq.c index 5e3d8a8a78..b1ed7867db 100644 --- a/src/mca/ptl/sm/src/ptl_sm_sendreq.c +++ b/src/mca/ptl/sm/src/ptl_sm_sendreq.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/tcp/src/ptl_tcp.c b/src/mca/ptl/tcp/src/ptl_tcp.c index 47f4668e24..4396e8606a 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.c +++ b/src/mca/ptl/tcp/src/ptl_tcp.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "util/output.h" #include "util/if.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_component.c b/src/mca/ptl/tcp/src/ptl_tcp_component.c index 38020163bc..1ae82c9b5b 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_component.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_component.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/tcp/src/ptl_tcp_peer.c b/src/mca/ptl/tcp/src/ptl_tcp_peer.c index 12906f3e1a..5bcf65b3bd 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_peer.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_peer.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c b/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c index 88c6778240..f4b032e747 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c index 9ee9945d54..f45921e780 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c b/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c index 768bb7838b..d0322a77ef 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c @@ -1,6 +1,7 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/svc/exec/svc_exec_component.c b/src/mca/svc/exec/svc_exec_component.c index d922dc0aba..7317ae2659 100644 --- a/src/mca/svc/exec/svc_exec_component.c +++ b/src/mca/svc/exec/svc_exec_component.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "svc_exec.h" diff --git a/src/mca/svc/sched/svc_sched_component.c b/src/mca/svc/sched/svc_sched_component.c index 788e5f6217..be54f91019 100644 --- a/src/mca/svc/sched/svc_sched_component.c +++ b/src/mca/svc/sched/svc_sched_component.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "svc_sched.h" #include "util/proc_info.h" diff --git a/src/mca/svc/sched/svc_sched_node.c b/src/mca/svc/sched/svc_sched_node.c index 80ed534823..298abd8518 100644 --- a/src/mca/svc/sched/svc_sched_node.c +++ b/src/mca/svc/sched/svc_sched_node.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "svc_sched_node.h" diff --git a/src/mca/svc/stdio.old/cioapp.c b/src/mca/svc/stdio.old/cioapp.c index 1d69170ebb..21501607a3 100644 --- a/src/mca/svc/stdio.old/cioapp.c +++ b/src/mca/svc/stdio.old/cioapp.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/svc/stdio.old/libcio.c b/src/mca/svc/stdio.old/libcio.c index 728f3747d8..f196385161 100644 --- a/src/mca/svc/stdio.old/libcio.c +++ b/src/mca/svc/stdio.old/libcio.c @@ -34,6 +34,7 @@ */ +#include "ompi_config.h" #include "libcio.h" #include "debug.h" diff --git a/src/mca/svc/stdio.old/libsio.c b/src/mca/svc/stdio.old/libsio.c index 5bb9f88b7d..73c87fc180 100644 --- a/src/mca/svc/stdio.old/libsio.c +++ b/src/mca/svc/stdio.old/libsio.c @@ -34,6 +34,7 @@ */ +#include "ompi_config.h" #include "libsio.h" #include "debug.h" diff --git a/src/mca/svc/stdio.old/sioapp.c b/src/mca/svc/stdio.old/sioapp.c index 8fe3a55d18..9d365a07a3 100644 --- a/src/mca/svc/stdio.old/sioapp.c +++ b/src/mca/svc/stdio.old/sioapp.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include "libsio.h" diff --git a/src/mca/svc/stdio.old/snipe_lite/memory.c b/src/mca/svc/stdio.old/snipe_lite/memory.c index 2ed262848f..1a854ab5b0 100644 --- a/src/mca/svc/stdio.old/snipe_lite/memory.c +++ b/src/mca/svc/stdio.old/snipe_lite/memory.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #if !defined(NDEBUG) #include #include diff --git a/src/mca/svc/stdio.old/snipe_lite/msg.c b/src/mca/svc/stdio.old/snipe_lite/msg.c index e42953eece..09ecfe88ca 100644 --- a/src/mca/svc/stdio.old/snipe_lite/msg.c +++ b/src/mca/svc/stdio.old/snipe_lite/msg.c @@ -33,6 +33,7 @@ */ +#include "ompi_config.h" #include "msgbuf.h" #include "msg.h" #ifdef WIN32 diff --git a/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c b/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c index ddd33f3a67..0494ba116d 100644 --- a/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c +++ b/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c @@ -44,6 +44,7 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c b/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c index af25e1a2a0..e018d9049b 100644 --- a/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c +++ b/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c @@ -42,6 +42,7 @@ */ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/svc/stdio.old/snipe_lite/syslog.c b/src/mca/svc/stdio.old/snipe_lite/syslog.c index 6e83c76eb4..8b2147d1fd 100644 --- a/src/mca/svc/stdio.old/snipe_lite/syslog.c +++ b/src/mca/svc/stdio.old/snipe_lite/syslog.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "syslog.h" #include "debug.h" #include diff --git a/src/mca/svc/stdio/svc_stdio_component.c b/src/mca/svc/stdio/svc_stdio_component.c index c7ec8983c4..c0962e40cb 100644 --- a/src/mca/svc/stdio/svc_stdio_component.c +++ b/src/mca/svc/stdio/svc_stdio_component.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "svc_stdio.h" diff --git a/src/mca/topo/base/topo_base_cart_coords.c b/src/mca/topo/base/topo_base_cart_coords.c index ad2446dc53..c5c9df5468 100644 --- a/src/mca/topo/base/topo_base_cart_coords.c +++ b/src/mca/topo/base/topo_base_cart_coords.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_cart_create.c b/src/mca/topo/base/topo_base_cart_create.c index 9ef5bec81b..891cc31143 100644 --- a/src/mca/topo/base/topo_base_cart_create.c +++ b/src/mca/topo/base/topo_base_cart_create.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "group/group.h" diff --git a/src/mca/topo/base/topo_base_cart_get.c b/src/mca/topo/base/topo_base_cart_get.c index 8d50163de9..f9cc42995c 100644 --- a/src/mca/topo/base/topo_base_cart_get.c +++ b/src/mca/topo/base/topo_base_cart_get.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_cart_rank.c b/src/mca/topo/base/topo_base_cart_rank.c index ff3e8b5b5f..864a43bc3c 100644 --- a/src/mca/topo/base/topo_base_cart_rank.c +++ b/src/mca/topo/base/topo_base_cart_rank.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_cart_shift.c b/src/mca/topo/base/topo_base_cart_shift.c index ce65b2243a..4da8ff86df 100644 --- a/src/mca/topo/base/topo_base_cart_shift.c +++ b/src/mca/topo/base/topo_base_cart_shift.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_cart_sub.c b/src/mca/topo/base/topo_base_cart_sub.c index c0043ed50b..68d95e54f2 100644 --- a/src/mca/topo/base/topo_base_cart_sub.c +++ b/src/mca/topo/base/topo_base_cart_sub.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_cartdim_get.c b/src/mca/topo/base/topo_base_cartdim_get.c index adbb47b40d..ab99bfb6c3 100644 --- a/src/mca/topo/base/topo_base_cartdim_get.c +++ b/src/mca/topo/base/topo_base_cartdim_get.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_comm_unselect.c b/src/mca/topo/base/topo_base_comm_unselect.c index 7f783eaba5..c6efe3f993 100644 --- a/src/mca/topo/base/topo_base_comm_unselect.c +++ b/src/mca/topo/base/topo_base_comm_unselect.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include #include diff --git a/src/mca/topo/base/topo_base_graph_create.c b/src/mca/topo/base/topo_base_graph_create.c index a50531646c..6b63018bfe 100644 --- a/src/mca/topo/base/topo_base_graph_create.c +++ b/src/mca/topo/base/topo_base_graph_create.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_graph_get.c b/src/mca/topo/base/topo_base_graph_get.c index ba4f64b2a6..ad46254807 100644 --- a/src/mca/topo/base/topo_base_graph_get.c +++ b/src/mca/topo/base/topo_base_graph_get.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_graph_neighbors.c b/src/mca/topo/base/topo_base_graph_neighbors.c index 42ce8842e6..b1cb1dc616 100644 --- a/src/mca/topo/base/topo_base_graph_neighbors.c +++ b/src/mca/topo/base/topo_base_graph_neighbors.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_graph_neighbors_count.c b/src/mca/topo/base/topo_base_graph_neighbors_count.c index 00f75b327a..279ae6b860 100644 --- a/src/mca/topo/base/topo_base_graph_neighbors_count.c +++ b/src/mca/topo/base/topo_base_graph_neighbors_count.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/base/topo_base_graphdims_get.c b/src/mca/topo/base/topo_base_graphdims_get.c index 797b9f64b7..854d9b395e 100644 --- a/src/mca/topo/base/topo_base_graphdims_get.c +++ b/src/mca/topo/base/topo_base_graphdims_get.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/base/base.h" #include "communicator/communicator.h" #include "mca/topo/topo.h" diff --git a/src/mca/topo/unity/src/topo_unity_cart_map.c b/src/mca/topo/unity/src/topo_unity_cart_map.c index 519049e3c2..083e435107 100644 --- a/src/mca/topo/unity/src/topo_unity_cart_map.c +++ b/src/mca/topo/unity/src/topo_unity_cart_map.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/unity/src/topo_unity.h" #include "communicator/communicator.h" diff --git a/src/mca/topo/unity/src/topo_unity_component.c b/src/mca/topo/unity/src/topo_unity_component.c index eed147f420..1e0845dd6c 100644 --- a/src/mca/topo/unity/src/topo_unity_component.c +++ b/src/mca/topo/unity/src/topo_unity_component.c @@ -8,6 +8,7 @@ * modules just to query their version and parameters */ +#include "ompi_config.h" #include "mca/topo/unity/src/topo_unity.h" #include "mca/topo/unity/topo-unity-version.h" diff --git a/src/mca/topo/unity/src/topo_unity_graph_map.c b/src/mca/topo/unity/src/topo_unity_graph_map.c index 150ab88eb8..d375d226e2 100644 --- a/src/mca/topo/unity/src/topo_unity_graph_map.c +++ b/src/mca/topo/unity/src/topo_unity_graph_map.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mca/topo/unity/src/topo_unity.h" #include "communicator/communicator.h" diff --git a/src/mpi/c/comm_join.c b/src/mpi/c/comm_join.c index 35d4341db1..981c79998b 100644 --- a/src/mpi/c/comm_join.c +++ b/src/mpi/c/comm_join.c @@ -4,11 +4,19 @@ #include "ompi_config.h" #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include +#ifdef HAVE_NETINET_IN_H #include +#endif #include "mpi.h" #include "mpi/c/bindings.h" diff --git a/src/mpi/c/error_string.c b/src/mpi/c/error_string.c index b238981ce4..765edb150d 100644 --- a/src/mpi/c/error_string.c +++ b/src/mpi/c/error_string.c @@ -1,8 +1,8 @@ /* * $HEADER$ */ -#include #include "ompi_config.h" +#include #include "mpi.h" #include "mpi/c/bindings.h" diff --git a/src/mpi/c/get_processor_name.c b/src/mpi/c/get_processor_name.c index 66332ae1a4..39ff62f5d2 100644 --- a/src/mpi/c/get_processor_name.c +++ b/src/mpi/c/get_processor_name.c @@ -3,7 +3,9 @@ */ #include "ompi_config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "mpi.h" diff --git a/src/mpi/c/wtime.c b/src/mpi/c/wtime.c index 5ba733153a..e4d80bc161 100644 --- a/src/mpi/c/wtime.c +++ b/src/mpi/c/wtime.c @@ -3,7 +3,9 @@ */ #include "ompi_config.h" #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include "mpi.h" #include "mpi/c/bindings.h" diff --git a/src/op/op_predefined.c b/src/op/op_predefined.c index dbf8257d58..071048425e 100644 --- a/src/op/op_predefined.c +++ b/src/op/op_predefined.c @@ -4,7 +4,9 @@ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #include "op/op.h" #include "op/op_predefined.h" diff --git a/src/proc/proc.c b/src/proc/proc.c index 0115bbc108..eb6073d1f5 100644 --- a/src/proc/proc.c +++ b/src/proc/proc.c @@ -2,9 +2,7 @@ * $HEADER */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include diff --git a/src/request/grequest.c b/src/request/grequest.c index bdb132274b..07293c4845 100644 --- a/src/request/grequest.c +++ b/src/request/grequest.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "request/grequest.h" diff --git a/src/runtime/ompi_progress.c b/src/runtime/ompi_progress.c index efd5337e45..cb8e30fa54 100644 --- a/src/runtime/ompi_progress.c +++ b/src/runtime/ompi_progress.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "event/event.h" #include "mca/pml/pml.h" #include "runtime/ompi_progress.h" diff --git a/src/runtime/ompi_rte_wait.c b/src/runtime/ompi_rte_wait.c index f0a763d67d..481525898d 100644 --- a/src/runtime/ompi_rte_wait.c +++ b/src/runtime/ompi_rte_wait.c @@ -6,10 +6,16 @@ #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_WAIT_H #include +#endif #include "runtime/ompi_rte_wait.h" #include "class/ompi_object.h" diff --git a/src/runtime/ompi_rte_wait.h b/src/runtime/ompi_rte_wait.h index f63db3c3b5..c9df17a766 100644 --- a/src/runtime/ompi_rte_wait.h +++ b/src/runtime/ompi_rte_wait.h @@ -13,7 +13,9 @@ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif /** typedef for callback function used in \c ompi_rte_wait_cb */ typedef void (*ompi_rte_wait_fn_t)(pid_t wpid, int status, void *data); diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h index f54811304a..94f6fed6a8 100644 --- a/src/runtime/runtime.h +++ b/src/runtime/runtime.h @@ -12,7 +12,9 @@ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #include "mca/gpr/base/base.h" #include "util/cmd_line.h" diff --git a/src/runtime/runtime_types.h b/src/runtime/runtime_types.h index 31875c6bb8..d4c8d4435c 100644 --- a/src/runtime/runtime_types.h +++ b/src/runtime/runtime_types.h @@ -15,8 +15,12 @@ #include "mca/ns/ns.h" #include "mca/pcm/pcm.h" +#ifdef HAVE_SYS_PARAM_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif /** * Spawn Handle diff --git a/src/runtime/universe_exists.c b/src/runtime/universe_exists.c index 85f9bbbc3d..352eaf88b2 100644 --- a/src/runtime/universe_exists.c +++ b/src/runtime/universe_exists.c @@ -12,7 +12,9 @@ #include "ompi_config.h" #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include "include/constants.h" #include "util/output.h" diff --git a/src/threads/condition_pthread.c b/src/threads/condition_pthread.c index 3ecbd77dce..79abe979b0 100644 --- a/src/threads/condition_pthread.c +++ b/src/threads/condition_pthread.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "mutex.h" #include "condition.h" diff --git a/src/threads/condition_pthread.h b/src/threads/condition_pthread.h index 8113e80c76..00a427a96d 100644 --- a/src/threads/condition_pthread.h +++ b/src/threads/condition_pthread.h @@ -4,7 +4,9 @@ #ifndef OMPI_CONDITION_PTHREAD_H #define OMPI_CONDITION_PTHREAD_H +#ifdef HAVE_PTHREAD_H #include +#endif #include "threads/mutex.h" struct ompi_condition_t { diff --git a/src/threads/condition_spinlock.c b/src/threads/condition_spinlock.c index 8d8ef66383..ba84ed80f2 100644 --- a/src/threads/condition_spinlock.c +++ b/src/threads/condition_spinlock.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "mutex.h" #include "condition.h" diff --git a/src/threads/condition_spinlock.h b/src/threads/condition_spinlock.h index a688700130..f6a6707159 100644 --- a/src/threads/condition_spinlock.h +++ b/src/threads/condition_spinlock.h @@ -5,7 +5,9 @@ #define OMPI_CONDITION_SPINLOCK_H #include "ompi_config.h" +#ifdef HAVE_SYS_TIME_H #include +#endif #include "threads/condition.h" #include "threads/mutex.h" #include "runtime/ompi_progress.h" diff --git a/src/threads/mutex.c b/src/threads/mutex.c index a5d4d6da4a..18ba3e003d 100644 --- a/src/threads/mutex.c +++ b/src/threads/mutex.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "threads/mutex.h" diff --git a/src/threads/mutex_unix.h b/src/threads/mutex_unix.h index d5a2ce76b6..5a7753beb8 100644 --- a/src/threads/mutex_unix.h +++ b/src/threads/mutex_unix.h @@ -18,8 +18,10 @@ #if OMPI_HAVE_POSIX_THREADS +#ifdef HAVE_PTHREAD_H #include #endif +#endif #include "class/ompi_object.h" #include "include/sys/atomic.h" diff --git a/src/threads/thread.c b/src/threads/thread.c index c72eb27dba..9574f57c35 100644 --- a/src/threads/thread.c +++ b/src/threads/thread.c @@ -2,9 +2,7 @@ * $HEADER$ */ -#ifdef HAVE_CONFIG_H #include "ompi_config.h" -#endif #include "include/constants.h" #include "threads/thread.h" diff --git a/src/threads/thread.h b/src/threads/thread.h index 38c8e82fd6..ac9bd90c4e 100644 --- a/src/threads/thread.h +++ b/src/threads/thread.h @@ -8,8 +8,10 @@ #ifdef __WINDOWS__ #include #elif OMPI_HAVE_POSIX_THREADS +#ifdef HAVE_PTHREAD_H #include #endif +#endif #include "class/ompi_object.h" diff --git a/src/tools/bootproxy/bootproxy.c b/src/tools/bootproxy/bootproxy.c index 211c1b16d7..a5c27b11e5 100644 --- a/src/tools/bootproxy/bootproxy.c +++ b/src/tools/bootproxy/bootproxy.c @@ -5,10 +5,16 @@ #include "ompi_config.h" #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_SYS_WAIT_H #include +#endif #include #include diff --git a/src/tools/mpirun/mpirun.c b/src/tools/mpirun/mpirun.c index 26c40df75f..ae5178c1d5 100644 --- a/src/tools/mpirun/mpirun.c +++ b/src/tools/mpirun/mpirun.c @@ -6,8 +6,12 @@ #include "ompi_config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include "include/constants.h" diff --git a/src/tools/ompid/ompid.c b/src/tools/ompid/ompid.c index f251892e82..43b9268fb5 100644 --- a/src/tools/ompid/ompid.c +++ b/src/tools/ompid/ompid.c @@ -7,9 +7,15 @@ #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include #include "include/constants.h" diff --git a/src/tools/openmpi/openmpi.c b/src/tools/openmpi/openmpi.c index 6306553645..26a960af12 100644 --- a/src/tools/openmpi/openmpi.c +++ b/src/tools/openmpi/openmpi.c @@ -12,9 +12,15 @@ #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include #include "event/event.h" diff --git a/src/tools/openmpi/openmpi.h b/src/tools/openmpi/openmpi.h index 9b6d020f4f..bdae827c24 100644 --- a/src/tools/openmpi/openmpi.h +++ b/src/tools/openmpi/openmpi.h @@ -2,7 +2,9 @@ * $HEADER$ */ +#ifdef HAVE_SYS_PARAM_H #include +#endif #include #ifndef OMPI_UNIVERSE_H diff --git a/src/util/argv.c b/src/util/argv.c index b578d6777f..1c4ab7105f 100644 --- a/src/util/argv.c +++ b/src/util/argv.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include diff --git a/src/util/bufpack.c b/src/util/bufpack.c index 195b1692d3..0df255f443 100644 --- a/src/util/bufpack.c +++ b/src/util/bufpack.c @@ -7,15 +7,23 @@ * pack/unpack buffer management functions * */ +#include "ompi_config.h" #include #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_UIO_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif -#include "ompi_config.h" #include "include/constants.h" #include "class/ompi_object.h" diff --git a/src/util/daemon_init.c b/src/util/daemon_init.c index f7f4de3d7b..8bc498ec26 100644 --- a/src/util/daemon_init.c +++ b/src/util/daemon_init.c @@ -4,10 +4,14 @@ #include "ompi_config.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "include/constants.h" diff --git a/src/util/few.c b/src/util/few.c index 2f15e74561..77f841d987 100644 --- a/src/util/few.c +++ b/src/util/few.c @@ -6,9 +6,13 @@ #include #include +#ifdef HAVE_SYS_WAIT_H #include +#endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include "include/constants.h" #include "util/few.h" diff --git a/src/util/if.c b/src/util/if.c index 1cc8a6d689..afe1b1baab 100644 --- a/src/util/if.c +++ b/src/util/if.c @@ -2,16 +2,33 @@ * $HEADER$ */ +#include "ompi_config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_SYS_IOCTL_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_INET_H #include +#endif +#ifdef HAVE_NET_IF_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif #include "include/constants.h" #include "class/ompi_list.h" diff --git a/src/util/if.h b/src/util/if.h index 92aef26966..3f82a39f2a 100644 --- a/src/util/if.h +++ b/src/util/if.h @@ -6,8 +6,12 @@ #ifndef _OMPI_IF_UTIL_ #define _OMPI_IF_UTIL_ +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_SOCKET_H #include +#endif /** * Lookup an interface by name and return its primary address. diff --git a/src/util/os_create_dirpath.c b/src/util/os_create_dirpath.c index b6904d163f..b183c7a07a 100644 --- a/src/util/os_create_dirpath.c +++ b/src/util/os_create_dirpath.c @@ -6,8 +6,12 @@ #include "ompi_config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIBGEN_H #include +#endif #include #include "include/constants.h" diff --git a/src/util/os_create_dirpath.h b/src/util/os_create_dirpath.h index b08b10ce33..29d38ce000 100644 --- a/src/util/os_create_dirpath.h +++ b/src/util/os_create_dirpath.h @@ -24,7 +24,9 @@ **/ #include +#ifdef HAVE_SYS_TYPES_H #include +#endif #include /** diff --git a/src/util/os_path.c b/src/util/os_path.c index fe2e67c322..b8ab9fa204 100644 --- a/src/util/os_path.c +++ b/src/util/os_path.c @@ -5,9 +5,15 @@ #include "ompi_config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIBGEN_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include #include diff --git a/src/util/output.c b/src/util/output.c index 9817bad702..b457664d32 100644 --- a/src/util/output.c +++ b/src/util/output.c @@ -7,11 +7,17 @@ #include #include #include +#ifdef HAVE_SYSLOG_H #include +#endif #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include "include/constants.h" #include "util/output.h" diff --git a/src/util/path.c b/src/util/path.c index 4641be469d..4f9581458f 100644 --- a/src/util/path.c +++ b/src/util/path.c @@ -4,11 +4,13 @@ /** @file **/ +#include "ompi_config.h" #include #include +#ifdef HAVE_UNISTD_H #include +#endif -#include "ompi_config.h" #include "util/path.h" #include "util/argv.h" diff --git a/src/util/proc_info.c b/src/util/proc_info.c index edef7cbda0..61add25556 100644 --- a/src/util/proc_info.c +++ b/src/util/proc_info.c @@ -6,8 +6,12 @@ #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include "include/constants.h" #include "runtime/runtime.h" diff --git a/src/util/proc_info.h b/src/util/proc_info.h index 2667a58d0f..e999b7f87b 100644 --- a/src/util/proc_info.h +++ b/src/util/proc_info.h @@ -10,7 +10,9 @@ */ +#ifdef HAVE_SYS_TYPES_H #include +#endif #include "mca/ns/ns.h" diff --git a/src/util/pty.c b/src/util/pty.c index a325d9dce7..8a2285c609 100644 --- a/src/util/pty.c +++ b/src/util/pty.c @@ -36,9 +36,13 @@ #ifdef HAVE_SYS_CDEFS_H # include #endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_SYS_IOCTL_H #include +#endif #include #ifdef HAVE_TERMIOS_H # include diff --git a/src/util/session_dir.c b/src/util/session_dir.c index 352e9209a3..3a7717d43b 100644 --- a/src/util/session_dir.c +++ b/src/util/session_dir.c @@ -9,24 +9,44 @@ #include "ompi_config.h" #include +#ifdef HAVE_PWD_H #include +#endif #include #include #include +#ifdef HAVE_LIBGEN_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_DIRENT_H #include +#endif /* +#ifdef HAVE_SYS_SOCKET_H #include -#include MAXHOSTNAMELEN in Solaris +#endif +#ifdef HAVE_NETDB_H +#include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_DIRENT_H #include +#endif #include #include diff --git a/src/util/strncpy.h b/src/util/strncpy.h index acfeb49383..3e793101f6 100644 --- a/src/util/strncpy.h +++ b/src/util/strncpy.h @@ -5,7 +5,9 @@ #ifndef OMPI_STRNCPY_H #define OMPI_STRNCPY_H +#ifdef HAVE_SYS_TYPES_H #include +#endif /* * Use ompi_strncpy() instead of strncpy() diff --git a/src/util/sys_info.c b/src/util/sys_info.c index d3e146780f..e2fefbd1a6 100644 --- a/src/util/sys_info.c +++ b/src/util/sys_info.c @@ -1,15 +1,21 @@ /* * $HEADER$ */ +#include "ompi_config.h" #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIBGEN_H #include +#endif #include +#ifdef HAVE_PWD_H #include +#endif #include -#include "ompi_config.h" #include "include/constants.h" #include "util/output.h" diff --git a/src/util/sys_info.h b/src/util/sys_info.h index 8db7028699..ada4be63ab 100644 --- a/src/util/sys_info.h +++ b/src/util/sys_info.h @@ -11,8 +11,12 @@ */ +#ifdef HAVE_SYS_UTSNAME_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif /** * System information structure diff --git a/src/util/universe_setup_file_io.c b/src/util/universe_setup_file_io.c index de136680f4..22dca377ac 100644 --- a/src/util/universe_setup_file_io.c +++ b/src/util/universe_setup_file_io.c @@ -8,10 +8,14 @@ #include "ompi_config.h" #include +#ifdef HAVE_SYS_TYPES_H #include +#endif #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include "include/constants.h" diff --git a/src/win/win.c b/src/win/win.c index e758f97dbf..02ce02e91e 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -2,4 +2,5 @@ * $HEADER$ */ +#include "ompi_config.h" #include "win/win.h" diff --git a/src/win32/ompi_utsname.c b/src/win32/ompi_utsname.c index 87bf836238..475ca7f6dc 100644 --- a/src/win32/ompi_utsname.c +++ b/src/win32/ompi_utsname.c @@ -2,6 +2,7 @@ $HEADER$ */ +#include "ompi_config.h" #include "ompi_utsname.h" #ifdef WIN32 diff --git a/test/class/ompi_bitmap.c b/test/class/ompi_bitmap.c index 9934598606..32a6005208 100644 --- a/test/class/ompi_bitmap.c +++ b/test/class/ompi_bitmap.c @@ -2,6 +2,7 @@ * Testcase for bitmap */ +#include "ompi_config.h" #include #include "support.h" #include "class/ompi_bitmap.h" diff --git a/test/class/ompi_circular_buffer_fifo.c b/test/class/ompi_circular_buffer_fifo.c index 138697dc08..d35503d0bf 100644 --- a/test/class/ompi_circular_buffer_fifo.c +++ b/test/class/ompi_circular_buffer_fifo.c @@ -3,6 +3,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "support.h" diff --git a/test/class/ompi_fifo.c b/test/class/ompi_fifo.c index 9da588f474..55de5227d2 100644 --- a/test/class/ompi_fifo.c +++ b/test/class/ompi_fifo.c @@ -3,6 +3,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "support.h" diff --git a/test/class/ompi_hash_table.c b/test/class/ompi_hash_table.c index 9b6f0e411e..5e2ee7265e 100644 --- a/test/class/ompi_hash_table.c +++ b/test/class/ompi_hash_table.c @@ -2,7 +2,10 @@ * $HEADER$ */ +#include "ompi_config.h" +#ifdef HAVE_STDINT_H #include +#endif #include #include "support.h" #include "class/ompi_object.h" diff --git a/test/class/ompi_list.c b/test/class/ompi_list.c index c7b20cb08f..b6556aaaff 100644 --- a/test/class/ompi_list.c +++ b/test/class/ompi_list.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include "support.h" diff --git a/test/class/ompi_pointer_array.c b/test/class/ompi_pointer_array.c index bd77419736..cbef8e2114 100644 --- a/test/class/ompi_pointer_array.c +++ b/test/class/ompi_pointer_array.c @@ -7,6 +7,7 @@ * class */ +#include "ompi_config.h" #include #include #include diff --git a/test/class/ompi_rb_tree.c b/test/class/ompi_rb_tree.c index 5b8261281b..340b750c66 100644 --- a/test/class/ompi_rb_tree.c +++ b/test/class/ompi_rb_tree.c @@ -2,7 +2,10 @@ * $HEADER$ */ +#include "ompi_config.h" +#ifdef HAVE_STDINT_H #include +#endif #include #include "support.h" #include "class/ompi_rb_tree.h" diff --git a/test/class/ompi_value_array.c b/test/class/ompi_value_array.c index c13a67ca20..4d3e0d9e19 100644 --- a/test/class/ompi_value_array.c +++ b/test/class/ompi_value_array.c @@ -6,6 +6,7 @@ * This test is intended to test the ompi_value_array class */ +#include "ompi_config.h" #include #include #include diff --git a/test/include/atomic.c b/test/include/atomic.c index 0f25cea210..824f5bc651 100644 --- a/test/include/atomic.c +++ b/test/include/atomic.c @@ -1,6 +1,9 @@ +#include "ompi_config.h" #include #include +#ifdef HAVE_PTHREAD_H #include +#endif #include #include #include diff --git a/test/mca/ns/test_ns_proxy.c b/test/mca/ns/test_ns_proxy.c index e0317cc818..2b027392a6 100644 --- a/test/mca/ns/test_ns_proxy.c +++ b/test/mca/ns/test_ns_proxy.c @@ -10,6 +10,7 @@ */ +#include "ompi_config.h" #include #include #include @@ -17,7 +18,6 @@ #include #include -#include "ompi_config.h" #include "support.h" #include "include/constants.h" diff --git a/test/mca/ns/test_ns_replica.c b/test/mca/ns/test_ns_replica.c index c743160891..3fa940d6f4 100644 --- a/test/mca/ns/test_ns_replica.c +++ b/test/mca/ns/test_ns_replica.c @@ -9,10 +9,10 @@ */ +#include "ompi_config.h" #include #include -#include "ompi_config.h" #include "support.h" #include "include/constants.h" diff --git a/test/mca/oob/oob_test.c b/test/mca/oob/oob_test.c index e321f7c23d..926207f880 100644 --- a/test/mca/oob/oob_test.c +++ b/test/mca/oob/oob_test.c @@ -6,6 +6,7 @@ */ +#include "ompi_config.h" #include #include #include diff --git a/test/mca/oob/oob_test_packed.c b/test/mca/oob/oob_test_packed.c index 9a0f549ce8..af663e79da 100644 --- a/test/mca/oob/oob_test_packed.c +++ b/test/mca/oob/oob_test_packed.c @@ -6,6 +6,7 @@ */ +#include "ompi_config.h" #include #include #include diff --git a/test/mca/oob/oob_test_self.c b/test/mca/oob/oob_test_self.c index f3015a4b60..4712be0db0 100755 --- a/test/mca/oob/oob_test_self.c +++ b/test/mca/oob/oob_test_self.c @@ -2,6 +2,7 @@ * In this test we try using oob to send messages to the same process. * to run: mpirun -np 1 -- oob_test_self */ +#include "ompi_config.h" #include #include #include diff --git a/test/rte/ompi_session_dir.c b/test/rte/ompi_session_dir.c index 0760455565..7c5795b249 100644 --- a/test/rte/ompi_session_dir.c +++ b/test/rte/ompi_session_dir.c @@ -2,15 +2,21 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIBGEN_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include -#include "ompi_config.h" #include "support.h" #include "include/constants.h" #include "util/sys_info.h" diff --git a/test/rte/sigchld.c b/test/rte/sigchld.c index 6f1aaa9bb4..a8a2739599 100644 --- a/test/rte/sigchld.c +++ b/test/rte/sigchld.c @@ -2,12 +2,17 @@ * $HEADER$ */ +#include "ompi_config.h" #include "mpi.h" #include "runtime/ompi_rte_wait.h" #include "runtime/ompi_progress.h" +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include #include diff --git a/test/support/support.c b/test/support/support.c index a5f6040af4..b1fef797c4 100644 --- a/test/support/support.c +++ b/test/support/support.c @@ -2,6 +2,7 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include diff --git a/test/threads/ompi_condition.c b/test/threads/ompi_condition.c index 6bf87f9383..d29cd1ae14 100644 --- a/test/threads/ompi_condition.c +++ b/test/threads/ompi_condition.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include #include #include "support.h" diff --git a/test/threads/ompi_thread.c b/test/threads/ompi_thread.c index b78654ebe0..8f08e0b7aa 100644 --- a/test/threads/ompi_thread.c +++ b/test/threads/ompi_thread.c @@ -1,3 +1,4 @@ +#include "ompi_config.h" #include "support.h" #include "include/constants.h" #include "threads/thread.h" diff --git a/test/util/ompi_argv.c b/test/util/ompi_argv.c index 480e7ef73e..262368001b 100644 --- a/test/util/ompi_argv.c +++ b/test/util/ompi_argv.c @@ -2,12 +2,12 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include #include "support.h" -#include "ompi_config.h" #include "include/constants.h" #include "util/argv.h" diff --git a/test/util/ompi_os_create_dirpath.c b/test/util/ompi_os_create_dirpath.c index 5b25a39d6b..b503240c59 100644 --- a/test/util/ompi_os_create_dirpath.c +++ b/test/util/ompi_os_create_dirpath.c @@ -2,14 +2,18 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include -#include "ompi_config.h" #include "include/constants.h" #include "util/sys_info.h" #include "util/os_path.h" diff --git a/test/util/ompi_os_path.c b/test/util/ompi_os_path.c index 64792ecb21..76d0a67ae7 100644 --- a/test/util/ompi_os_path.c +++ b/test/util/ompi_os_path.c @@ -2,12 +2,14 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include +#ifdef HAVE_SYS_PARAM_H #include +#endif -#include "ompi_config.h" #include "util/sys_info.h" #include "util/os_path.h" #include "support.h" diff --git a/test/util/ompi_pack.c b/test/util/ompi_pack.c index f0e6f3dd0e..8cadd6dc97 100644 --- a/test/util/ompi_pack.c +++ b/test/util/ompi_pack.c @@ -2,14 +2,18 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include +#ifdef HAVE_SYS_PARAM_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif -#include "ompi_config.h" #include "util/sys_info.h" #include "support.h" #include "../src/util/bufpack.h" diff --git a/test/util/ompi_session_dir.c b/test/util/ompi_session_dir.c index 60c5cb12b8..7b89dd1b3b 100644 --- a/test/util/ompi_session_dir.c +++ b/test/util/ompi_session_dir.c @@ -2,15 +2,21 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIBGEN_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include -#include "ompi_config.h" #include "include/constants.h" #include "util/sys_info.h" #include "util/os_path.h" diff --git a/test/util/ompi_sys_info.c b/test/util/ompi_sys_info.c index 479cfa7f0b..8474948a65 100644 --- a/test/util/ompi_sys_info.c +++ b/test/util/ompi_sys_info.c @@ -2,12 +2,14 @@ * $HEADER$ */ +#include "ompi_config.h" #include #include #include +#ifdef HAVE_SYS_PARAM_H #include +#endif -#include "ompi_config.h" #include "util/sys_info.h" #include "support.h"