open-mpi · hjelmn · Jun 25, 2015 · Jun 24, 2015
diff --git 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
@@ -81,9 +81,7 @@
 
 #include "ompi_config.h"
 
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 #include "mpi.h"
 

diff --git a/ompi/datatype/ompi_datatype.h b/ompi/datatype/ompi_datatype.h
@@ -28,15 +28,9 @@
 #include "ompi_config.h"
 
 #include <stddef.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#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
@@ -20,9 +20,7 @@
 #include "ompi_config.h"
 
 #include <stddef.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#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
@@ -36,12 +36,8 @@
 
 #include "ompi_config.h"
 
-#if defined(HAVE_STRING_H)
 #include <string.h>
-#endif  /* defined(HAVE_STRING_H) */
-#if defined(HAVE_STDLIB_H)
 #include <stdlib.h>
-#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
@@ -71,12 +71,8 @@
 #ifdef HAVE_NO_C_CONST
 #define const
 #endif
-#if defined(HAVE_STRING_H)
 #include <string.h>
-#endif  /* defined(HAVE_STRING_H) */
-#if defined(HAVE_STDLIB_H)
 #include <stdlib.h>
-#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
@@ -26,9 +26,7 @@
 #include "ompi_config.h"
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "mpi.h"
 

diff --git a/ompi/errhandler/errhandler.c b/ompi/errhandler/errhandler.c
@@ -23,9 +23,7 @@
 
 #include "ompi_config.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "ompi/communicator/communicator.h"
 #include "ompi/win/win.h"

diff --git 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 <string.h>
-#endif
 #include <errno.h>
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git 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 <string.h>
-#endif
 #include <stdio.h>
 
 #include "coll_cuda.h"

diff --git 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 <stdlib.h>
-#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
@@ -19,9 +19,7 @@
 
 #include "ompi_config.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#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
@@ -34,9 +34,7 @@
 #include "ompi_config.h"
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #ifdef HAVE_SCHED_H
 #include <sched.h>
 #endif

diff --git 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 <string.h>
-#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
@@ -25,9 +25,7 @@
 #include "ompi_config.h"
 #include "ompi/constants.h"
 
-#if HAVE_TIME_H
 #include <time.h>
-#endif
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

diff --git 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 <string.h>
 #include <stdio.h>
-#if HAVE_TIME_H
 #include <time.h>
-#endif
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

diff --git 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 <time.h>
-#endif
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

diff --git a/ompi/mca/dpm/orte/dpm_orte.c b/ompi/mca/dpm/orte/dpm_orte.c
@@ -31,9 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#if HAVE_TIME_H
 #include <time.h>
-#endif
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #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
@@ -9,9 +9,7 @@
 
 #include "ad_xfs.h"
 #include <sys/ioctl.h>
-#ifdef HAVE_STDDEF_H
 #include <stddef.h>
-#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
@@ -15,12 +15,8 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git 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 <string.h>
-#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
@@ -32,9 +32,7 @@
 
 #include "opal_config.h"
 
-#ifdef HAVE_STDDEF_H
 #include <stddef.h>
-#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
@@ -26,9 +26,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif  /* HAVE_UNIST_H */

diff --git 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 <string.h>
-#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
@@ -17,9 +17,7 @@
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-#if defined(HAVE_STRING_H)
 #include <string.h>
-#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
@@ -20,9 +20,7 @@
 
 #include "ompi_config.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#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
@@ -13,9 +13,7 @@
 
 #include "ompi_config.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#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
@@ -47,9 +47,7 @@
 #include "ompi_config.h"
 
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #ifdef HAVE_TARGETCONDITIONALS_H
 #include <TargetConditionals.h>
 #endif

diff --git 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 <sys/types.h>
 #endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #ifdef HAVE_TARGETCONDITIONALS_H
 #include <TargetConditionals.h>
 #endif

diff --git a/ompi/peruse/peruse.c b/ompi/peruse/peruse.c
@@ -12,9 +12,7 @@
  */
 
 #include "ompi_config.h"
-#ifdef HAVE_STRING_H
 #  include <string.h>
-#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
@@ -13,9 +13,7 @@
  */
 
 #include "ompi_config.h"
-#ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
-#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
@@ -24,12 +24,8 @@
 
 #include "ompi_config.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-#ifdef HAVE_TIME_H
 #include <time.h>
-#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
@@ -36,9 +36,7 @@
 #include <sys/param.h>
 #endif
 #include <errno.h>
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#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
@@ -37,9 +37,7 @@
 
 #include "opal_config.h"
 
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#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
@@ -116,9 +116,7 @@
 
 #include "opal_config.h"
 #include <assert.h>
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif  /* HAVE_STDLIB_H */
 
 #include "opal/sys/atomic.h"