diff --git a/config/opal_config_subdir.m4 b/config/opal_config_subdir.m4 index b6e20c802b3..b0476528443 100644 --- a/config/opal_config_subdir.m4 +++ b/config/opal_config_subdir.m4 @@ -12,8 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2014 Intel, Inc. All rights reserved. -dnl Copyright (c) 2015 Research Organization for Information Science -dnl and Technology (RIST). All rights reserved. +dnl Copyright (c) 2015-2018 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -22,7 +22,7 @@ dnl $HEADER$ dnl AC_DEFUN([OPAL_CONFIG_SUBDIR],[ -OPAL_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp]) +OPAL_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part subdir_temp]) # # Invoke configure in a specific subdirectory. @@ -58,8 +58,8 @@ if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then [[\\/]]* | ?:[[\\/]]* ) total_dir=;; *) total_dir=.;; esac - temp=$subdir_dir - for dir_part in `IFS='/\\'; set X $temp; shift; echo "$[@]"`; do + subdir_temp=$subdir_dir + for dir_part in `IFS='/\\'; set X $subdir_temp; shift; echo "$[@]"`; do case $dir_part in # Skip DOS drivespec ?:) total_dir=$dir_part ;; diff --git a/ompi/mca/common/monitoring/Makefile.am b/ompi/mca/common/monitoring/Makefile.am index 1812245cdeb..52959c3e30e 100644 --- a/ompi/mca/common/monitoring/Makefile.am +++ b/ompi/mca/common/monitoring/Makefile.am @@ -3,8 +3,8 @@ # of Tennessee Research Foundation. All rights # reserved. # Copyright (c) 2016 Inria. All rights reserved. -# Copyright (c) 2017 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2017-2018 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2018 Cisco Systems, Inc. All rights reserved # $COPYRIGHT$ # @@ -13,11 +13,15 @@ # $HEADER$ # +include $(top_srcdir)/Makefile.ompi-rules + EXTRA_DIST = profile2mat.pl aggregate_profile.pl sources = common_monitoring.c common_monitoring_coll.c headers = common_monitoring.h common_monitoring_coll.h +# See the comments in opal/mca/common/sm/Makefile.am for the explanations + lib_LTLIBRARIES = noinst_LTLIBRARIES = component_install = libmca_common_monitoring.la @@ -50,15 +54,7 @@ libmca_common_monitoring_la_LDFLAGS = \ libmca_common_monitoring_la_LIBADD = $(common_monitoring_LIBS) libmca_common_monitoring_noinst_la_SOURCES = $(headers) $(sources) -# These two rules will sym link the "noinst" libtool library filename -# to the installable libtool library filename in the case where we are -# compiling this component statically (case 2), described above). -V=0 -OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V) -ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY) -ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(component_install)`; - -all-local: +all-local: $(component_noinst) $(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \ rm -f "$(component_install)"; \ $(LN_S) "$(component_noinst)" "$(component_install)"; \ diff --git a/ompi/mca/common/ompio/Makefile.am b/ompi/mca/common/ompio/Makefile.am index d8ed32b9f6e..c19e28b6879 100644 --- a/ompi/mca/common/ompio/Makefile.am +++ b/ompi/mca/common/ompio/Makefile.am @@ -12,7 +12,7 @@ # Copyright (c) 2008-2018 University of Houston. All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2017-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# and Technology (RIST). All rights reserved. # # $COPYRIGHT$ # @@ -21,6 +21,8 @@ # $HEADER$ # +include $(top_srcdir)/Makefile.ompi-rules + headers = \ common_ompio_aggregators.h \ common_ompio_print_queue.h \ @@ -37,14 +39,7 @@ sources = \ common_ompio_file_write.c -# To simplify components that link to this library, we will *always* -# have an output libtool library named libmca__.la -- even -# for case 2) described above (i.e., so there's no conditional logic -# necessary in component Makefile.am's that link to this library). -# Hence, if we're creating a noinst version of this library (i.e., -# case 2), we sym link it to the libmca__.la name -# (libtool will do the Right Things under the covers). See the -# all-local and clean-local rules, below, for how this is effected. +# See the comments in opal/mca/common/sm/Makefile.am for the explanations lib_LTLIBRARIES = noinst_LTLIBRARIES = @@ -79,15 +74,7 @@ headers += common_ompio_cuda.h sources += common_ompio_cuda.c endif -# These two rules will sym link the "noinst" libtool library filename -# to the installable libtool library filename in the case where we are -# compiling this component statically (case 2), described above). -V=0 -OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V) -ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY) -ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`; - -all-local: +all-local: $(comp_noinst) $(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \ rm -f "$(comp_inst)"; \ $(LN_S) "$(comp_noinst)" "$(comp_inst)"; \ diff --git a/ompi/mca/fbtl/posix/fbtl_posix.c b/ompi/mca/fbtl/posix/fbtl_posix.c index f557636acc8..1e63e679684 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix.c +++ b/ompi/mca/fbtl/posix/fbtl_posix.c @@ -31,7 +31,7 @@ #include #include -#if HAVE_AIO_H +#ifdef HAVE_AIO_H #include #endif diff --git a/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c b/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c index 6b5476b584b..452d8fbe95d 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c @@ -25,7 +25,7 @@ #include #include -#if HAVE_AIO_H +#ifdef HAVE_AIO_H #include #endif diff --git a/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c b/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c index 0cabdc14085..f0304d2b85e 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c @@ -24,7 +24,7 @@ #include #include -#if HAVE_AIO_H +#ifdef HAVE_AIO_H #include #endif diff --git a/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c b/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c index 6526ee52480..510cf949a9c 100644 --- a/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c +++ b/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c @@ -25,10 +25,10 @@ #include "ompi_config.h" -#if HAVE_LIBGEN_H +#ifdef HAVE_LIBGEN_H #include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif diff --git a/opal/mca/common/sm/Makefile.am b/opal/mca/common/sm/Makefile.am index ba57c100da5..ab64fe15d3a 100644 --- a/opal/mca/common/sm/Makefile.am +++ b/opal/mca/common/sm/Makefile.am @@ -12,6 +12,8 @@ # Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010-2015 Los Alamos National Security, LLC. # All rights reserved. +# Copyright (c) 2018 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -41,6 +43,8 @@ # Note that building this common component statically and linking # against other dynamic components is *not* supported! +include $(top_srcdir)/Makefile.ompi-rules + # Header files headers = \ @@ -101,13 +105,7 @@ endif # to the installable libtool library filename in the case where we are # compiling this component statically (case 2), described above). -# See Makefile.ompi-rules for an explanation of the "V" macros, below -V=0 -OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V) -ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY) -ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`; - -all-local: +all-local: $(comp_noinst) $(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \ rm -f "$(comp_inst)"; \ $(LN_S) "$(comp_noinst)" "$(comp_inst)"; \ diff --git a/opal/mca/compress/base/compress_base_fns.c b/opal/mca/compress/base/compress_base_fns.c index 7e8c9264c41..6c0129e18c1 100644 --- a/opal/mca/compress/base/compress_base_fns.c +++ b/opal/mca/compress/base/compress_base_fns.c @@ -1,9 +1,8 @@ /* * Copyright (c) 2004-2010 The Trustees of Indiana University. * All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. - * + * Copyright (c) 2015-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * $COPYRIGHT$ * @@ -16,10 +15,10 @@ #include #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H #include #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H #include #endif #ifdef HAVE_FCNTL_H diff --git a/opal/mca/compress/bzip/compress_bzip_module.c b/opal/mca/compress/bzip/compress_bzip_module.c index 7cc4e825fce..6e7b5eecd96 100644 --- a/opal/mca/compress/bzip/compress_bzip_module.c +++ b/opal/mca/compress/bzip/compress_bzip_module.c @@ -3,9 +3,9 @@ * All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * $COPYRIGHT$ * @@ -20,7 +20,7 @@ #include #include #include -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/opal/mca/compress/gzip/compress_gzip_module.c b/opal/mca/compress/gzip/compress_gzip_module.c index bbaabc772a2..a1d97796537 100644 --- a/opal/mca/compress/gzip/compress_gzip_module.c +++ b/opal/mca/compress/gzip/compress_gzip_module.c @@ -3,9 +3,9 @@ * All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * $COPYRIGHT$ * @@ -20,7 +20,7 @@ #include #include #include -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ diff --git a/opal/mca/event/libevent2022/libevent/event.h b/opal/mca/event/libevent2022/libevent/event.h index a3785b987a1..e0c7582aebd 100644 --- a/opal/mca/event/libevent2022/libevent/event.h +++ b/opal/mca/event/libevent2022/libevent/event.h @@ -56,7 +56,7 @@ extern "C" { /* For int types. */ #include -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c index eb7eece810d..9b77feeda85 100644 --- a/opal/mca/hwloc/base/hwloc_base_util.c +++ b/opal/mca/hwloc/base/hwloc_base_util.c @@ -14,7 +14,7 @@ * Copyright (c) 2012-2017 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2018 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science + * Copyright (c) 2015-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (C) 2018 Mellanox Technologies, Ltd. * All rights reserved. @@ -42,7 +42,7 @@ #ifdef HAVE_SYS_STAT_H #include #endif -#if HAVE_FCNTL_H +#ifdef HAVE_FCNTL_H #include #endif diff --git a/opal/mca/mpool/base/mpool_base_tree.c b/opal/mca/mpool/base/mpool_base_tree.c index 5d7adc25e72..1a3a20868c6 100644 --- a/opal/mca/mpool/base/mpool_base_tree.c +++ b/opal/mca/mpool/base/mpool_base_tree.c @@ -15,8 +15,8 @@ * Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2012-2015 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2015-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * $COPYRIGHT$ * @@ -27,6 +27,10 @@ #include "opal_config.h" +#ifdef HAVE_UNISTD_H +#include +#endif + #include "opal/mca/mca.h" #include "opal/util/show_help.h" #include "opal/util/proc.h" diff --git a/opal/mca/pmix/pmix4x/pmix/config/pmix_config_subdir.m4 b/opal/mca/pmix/pmix4x/pmix/config/pmix_config_subdir.m4 index f42bb3f57b4..779f3d74b80 100644 --- a/opal/mca/pmix/pmix4x/pmix/config/pmix_config_subdir.m4 +++ b/opal/mca/pmix/pmix4x/pmix/config/pmix_config_subdir.m4 @@ -12,8 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2012-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2014-2018 Intel, Inc. All rights reserved. -dnl Copyright (c) 2015 Research Organization for Information Science -dnl and Technology (RIST). All rights reserved. +dnl Copyright (c) 2015-2018 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -22,7 +22,7 @@ dnl $HEADER$ dnl AC_DEFUN([PMIX_CONFIG_SUBDIR],[ -PMIX_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp]) +PMIX_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part subdir_temp]) # # Invoke configure in a specific subdirectory. @@ -58,8 +58,8 @@ if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then [[\\/]]* | ?:[[\\/]]* ) total_dir=;; *) total_dir=.;; esac - temp=$subdir_dir - for dir_part in `IFS='/\\'; set X $temp; shift; echo "$[@]"`; do + subdir_temp=$subdir_dir + for dir_part in `IFS='/\\'; set X $subdir_temp; shift; echo "$[@]"`; do case $dir_part in # Skip DOS drivespec ?:) total_dir=$dir_part ;; diff --git a/opal/mca/pmix/pmix4x/pmix/src/mca/common/dstore/Makefile.am b/opal/mca/pmix/pmix4x/pmix/src/mca/common/dstore/Makefile.am index 7638cf3ae9e..7f3032a9765 100644 --- a/opal/mca/pmix/pmix4x/pmix/src/mca/common/dstore/Makefile.am +++ b/opal/mca/pmix/pmix4x/pmix/src/mca/common/dstore/Makefile.am @@ -46,7 +46,7 @@ pmixdir = $(pmixincludedir)/$(subdir) pmix_HEADERS = $(headers) endif -all-local: +all-local: $(comp_noinst) if test -z "$(lib_LTLIBRARIES)"; then \ rm -f "$(comp_inst)"; \ $(LN_S) "$(comp_noinst)" "$(comp_inst)"; \ diff --git a/opal/mca/rcache/grdma/rcache_grdma.h b/opal/mca/rcache/grdma/rcache_grdma.h index 83b0ade769d..9c02705d597 100644 --- a/opal/mca/rcache/grdma/rcache_grdma.h +++ b/opal/mca/rcache/grdma/rcache_grdma.h @@ -13,6 +13,8 @@ * Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * * $COPYRIGHT$ * @@ -30,7 +32,7 @@ #include "opal/class/opal_list.h" #include "opal/mca/event/event.h" #include "opal/mca/rcache/rcache.h" -#if HAVE_SYS_MMAN_H +#ifdef HAVE_SYS_MMAN_H #include #endif diff --git a/opal/mca/rcache/udreg/rcache_udreg.h b/opal/mca/rcache/udreg/rcache_udreg.h index de3b6313fe6..3da5022f09a 100644 --- a/opal/mca/rcache/udreg/rcache_udreg.h +++ b/opal/mca/rcache/udreg/rcache_udreg.h @@ -13,6 +13,8 @@ * Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2011-2016 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * * $COPYRIGHT$ * @@ -32,7 +34,7 @@ #include "opal/mca/event/event.h" #include "opal/mca/rcache/rcache.h" #include "opal/util/proc.h" -#if HAVE_SYS_MMAN_H +#ifdef HAVE_SYS_MMAN_H #include #endif diff --git a/opal/mca/shmem/sysv/shmem_sysv_component.c b/opal/mca/shmem/sysv/shmem_sysv_component.c index b53fd3bed1f..3f26611fb11 100644 --- a/opal/mca/shmem/sysv/shmem_sysv_component.c +++ b/opal/mca/shmem/sysv/shmem_sysv_component.c @@ -14,8 +14,8 @@ * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -43,10 +43,10 @@ #ifdef HAVE_SYS_IPC_H #include #endif /* HAVE_SYS_IPC_H */ -#if HAVE_SYS_SHM_H +#ifdef HAVE_SYS_SHM_H #include #endif /* HAVE_SYS_SHM_H */ -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ diff --git a/opal/mca/shmem/sysv/shmem_sysv_module.c b/opal/mca/shmem/sysv/shmem_sysv_module.c index c8190db04cc..f835c29031d 100644 --- a/opal/mca/shmem/sysv/shmem_sysv_module.c +++ b/opal/mca/shmem/sysv/shmem_sysv_module.c @@ -13,6 +13,8 @@ * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2010-2012 Los Alamos National Security, LLC. * All rights reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * * $COPYRIGHT$ * @@ -39,10 +41,10 @@ #ifdef HAVE_SYS_IPC_H #include #endif /* HAVE_SYS_IPC_H */ -#if HAVE_SYS_SHM_H +#ifdef HAVE_SYS_SHM_H #include #endif /* HAVE_SYS_SHM_H */ -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ #include diff --git a/opal/util/os_dirpath.c b/opal/util/os_dirpath.c index 2328179d7f6..2ce31957b6b 100644 --- a/opal/util/os_dirpath.c +++ b/opal/util/os_dirpath.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science + * Copyright (c) 2015-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ @@ -28,7 +28,7 @@ #include #endif /* HAVE_UNISTD_H */ #include -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ #ifdef HAVE_SYS_TYPES_H diff --git a/orte/mca/errmgr/base/errmgr_base_fns.c b/orte/mca/errmgr/base/errmgr_base_fns.c index 538c97de94a..f07667f792f 100644 --- a/orte/mca/errmgr/base/errmgr_base_fns.c +++ b/orte/mca/errmgr/base/errmgr_base_fns.c @@ -14,8 +14,8 @@ * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2018 Intel, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,16 +28,16 @@ #include "orte/constants.h" #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ #ifdef HAVE_DIRENT_H diff --git a/orte/mca/rtc/hwloc/rtc_hwloc.c b/orte/mca/rtc/hwloc/rtc_hwloc.c index 04ed3d0afe6..7c210990db1 100644 --- a/orte/mca/rtc/hwloc/rtc_hwloc.c +++ b/orte/mca/rtc/hwloc/rtc_hwloc.c @@ -2,6 +2,8 @@ * Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2017-2018 Cisco Systems, Inc. All rights reserved * Copyright (c) 2017 Inria. All rights reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,7 +30,7 @@ #ifdef HAVE_SYS_STAT_H #include #endif -#if HAVE_FCNTL_H +#ifdef HAVE_FCNTL_H #include #endif diff --git a/orte/mca/state/base/state_base_fns.c b/orte/mca/state/base/state_base_fns.c index accda8edd31..d241f772ed9 100644 --- a/orte/mca/state/base/state_base_fns.c +++ b/orte/mca/state/base/state_base_fns.c @@ -15,10 +15,10 @@ #include "orte_config.h" #include "orte/constants.h" -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H #include #endif -#if HAVE_FCNTL_H +#ifdef HAVE_FCNTL_H #include #endif diff --git a/orte/runtime/orte_wait.h b/orte/runtime/orte_wait.h index 922f936bbfd..4e8809bd18e 100644 --- a/orte/runtime/orte_wait.h +++ b/orte/runtime/orte_wait.h @@ -14,6 +14,8 @@ * Copyright (c) 2011 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -36,7 +38,7 @@ #include #endif #include -#if HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H #include #endif diff --git a/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c b/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c index 4c72c571cfe..c3b874d8bce 100644 --- a/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c +++ b/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c @@ -2,8 +2,8 @@ /* * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014-2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -26,10 +26,10 @@ #ifdef HAVE_SYS_IPC_H #include #endif /* HAVE_SYS_IPC_H */ -#if HAVE_SYS_SHM_H +#ifdef HAVE_SYS_SHM_H #include #endif /* HAVE_SYS_SHM_H */ -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ diff --git a/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c b/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c index a1d112da7d9..e0379aa5003 100644 --- a/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c +++ b/oshmem/mca/sshmem/sysv/sshmem_sysv_module.c @@ -2,6 +2,8 @@ * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2018 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,10 +29,10 @@ #ifdef HAVE_SYS_IPC_H #include #endif /* HAVE_SYS_IPC_H */ -#if HAVE_SYS_SHM_H +#ifdef HAVE_SYS_SHM_H #include #endif /* HAVE_SYS_SHM_H */ -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H #include #endif /* HAVE_SYS_STAT_H */ #include