From b3bb90cf2dfa8d511cebd93c7b9570331e7c334a Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 27 Mar 2014 17:56:00 +0000 Subject: [PATCH] Do not include inttypes.h directly in Open MPI. Use opal_stdint.h instead. This commit should finish the work started for #869. Closing that ticket with this commit. Closes trac:869 cmr=v1.8.1:reviewer=jsquyres This commit was SVN r31257. The following Trac tickets were found above: Ticket 869 --> https://svn.open-mpi.org/trac/ompi/ticket/869 --- ompi/mca/bcol/iboffload/bcol_iboffload_allgather.c | 5 ++++- ompi/mca/bcol/iboffload/bcol_iboffload_allreduce.c | 5 ++++- ompi/mca/bcol/iboffload/bcol_iboffload_bcast.c | 5 ++++- ompi/mca/btl/openib/btl_openib.c | 6 ++---- ompi/mca/btl/portals4/btl_portals4.c | 5 ++++- ompi/mca/common/ofacm/common_ofacm_oob.c | 5 +++-- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ompi/mca/bcol/iboffload/bcol_iboffload_allgather.c b/ompi/mca/bcol/iboffload/bcol_iboffload_allgather.c index 3656eb82d8..28140e5bb7 100644 --- a/ompi/mca/bcol/iboffload/bcol_iboffload_allgather.c +++ b/ompi/mca/bcol/iboffload/bcol_iboffload_allgather.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. + * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -15,7 +18,7 @@ #include #include #include -#include +#include "opal_stdint.h" #include "bcol_iboffload.h" #include "bcol_iboffload_alltoall.h" diff --git a/ompi/mca/bcol/iboffload/bcol_iboffload_allreduce.c b/ompi/mca/bcol/iboffload/bcol_iboffload_allreduce.c index 6f9eb661ee..406442ff7c 100644 --- a/ompi/mca/bcol/iboffload/bcol_iboffload_allreduce.c +++ b/ompi/mca/bcol/iboffload/bcol_iboffload_allreduce.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. + * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,7 +26,7 @@ #include #include #include -#include +#include "opal_stdint.h" #include "bcol_iboffload.h" #include "bcol_iboffload_frag.h" diff --git a/ompi/mca/bcol/iboffload/bcol_iboffload_bcast.c b/ompi/mca/bcol/iboffload/bcol_iboffload_bcast.c index 42f66e4d81..9b5b216e65 100644 --- a/ompi/mca/bcol/iboffload/bcol_iboffload_bcast.c +++ b/ompi/mca/bcol/iboffload/bcol_iboffload_bcast.c @@ -1,9 +1,12 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2013 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. + * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,7 +21,7 @@ #include #include #include -#include +#include "opal_stdint.h" #include "bcol_iboffload.h" #include "bcol_iboffload_bcast.h" diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c index 978ef4a357..11fb71e118 100644 --- a/ompi/mca/btl/openib/btl_openib.c +++ b/ompi/mca/btl/openib/btl_openib.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2007-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved. - * Copyright (c) 2006-2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2006-2014 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2006-2007 Voltaire All rights reserved. * Copyright (c) 2008-2012 Oracle and/or its affiliates. All rights reserved. @@ -28,9 +28,7 @@ #include "ompi_config.h" #include -#ifdef HAVE_INTTYPES_H -#include -#endif +#include "opal_stdint.h" #include "opal/class/opal_bitmap.h" #include "opal/util/output.h" #include "opal/util/arch.h" diff --git a/ompi/mca/btl/portals4/btl_portals4.c b/ompi/mca/btl/portals4/btl_portals4.c index d6eb4dbd60..60eccbed31 100644 --- a/ompi/mca/btl/portals4/btl_portals4.c +++ b/ompi/mca/btl/portals4/btl_portals4.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010-2012 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,7 +25,7 @@ #include #include #include -#include +#include "opal_stdint.h" #include "ompi/runtime/ompi_module_exchange.h" diff --git a/ompi/mca/common/ofacm/common_ofacm_oob.c b/ompi/mca/common/ofacm/common_ofacm_oob.c index 600c20cc74..77e1dfc03b 100644 --- a/ompi/mca/common/ofacm/common_ofacm_oob.c +++ b/ompi/mca/common/ofacm/common_ofacm_oob.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006-2013 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2006-2012 Los Alamos National Security, LLC. All rights + * Copyright (c) 2006-2014 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2008-2012 Mellanox Technologies. All rights reserved. * @@ -38,7 +39,7 @@ #include "opal/class/opal_object.h" #include "ompi/constants.h" -#include +#include "opal_stdint.h" #define MAX_LINE_LEN 80 #define NUM_OF_TOKENS 7