From 38fde640ad1f845c2fbea3ce2d455bf4569f2716 Mon Sep 17 00:00:00 2001 From: Tim Prins Date: Wed, 19 Sep 2007 23:24:23 +0000 Subject: [PATCH] Fix builds on FreeBSD by renaming strings.h to f77_strings.h so that our file does not get accidently included by FreeBSD's string.h. Thanks to Karol Mroz for pointing out the problem. This commit was SVN r16164. --- ompi/mpi/f77/Makefile.am | 4 ++-- ompi/mpi/f77/add_error_string_f.c | 4 ++-- ompi/mpi/f77/close_port_f.c | 4 ++-- ompi/mpi/f77/comm_accept_f.c | 4 ++-- ompi/mpi/f77/comm_connect_f.c | 4 ++-- ompi/mpi/f77/comm_get_name_f.c | 4 ++-- ompi/mpi/f77/comm_set_name_f.c | 4 ++-- ompi/mpi/f77/comm_spawn_f.c | 4 ++-- ompi/mpi/f77/comm_spawn_multiple_f.c | 4 ++-- ompi/mpi/f77/error_string_f.c | 4 ++-- ompi/mpi/f77/{strings.h => f77_strings.h} | 0 ompi/mpi/f77/file_delete_f.c | 4 ++-- ompi/mpi/f77/file_get_view_f.c | 4 ++-- ompi/mpi/f77/file_open_f.c | 4 ++-- ompi/mpi/f77/file_set_view_f.c | 4 ++-- ompi/mpi/f77/get_processor_name_f.c | 4 ++-- ompi/mpi/f77/info_delete_f.c | 4 ++-- ompi/mpi/f77/info_get_f.c | 4 ++-- ompi/mpi/f77/info_get_nthkey_f.c | 4 ++-- ompi/mpi/f77/info_get_valuelen_f.c | 4 ++-- ompi/mpi/f77/info_set_f.c | 4 ++-- ompi/mpi/f77/lookup_name_f.c | 4 ++-- ompi/mpi/f77/open_port_f.c | 4 ++-- ompi/mpi/f77/publish_name_f.c | 4 ++-- ompi/mpi/f77/register_datarep_f.c | 4 ++-- ompi/mpi/f77/strings.c | 4 ++-- ompi/mpi/f77/type_get_name_f.c | 4 ++-- ompi/mpi/f77/type_set_name_f.c | 4 ++-- ompi/mpi/f77/unpublish_name_f.c | 4 ++-- ompi/mpi/f77/win_get_name_f.c | 4 ++-- ompi/mpi/f77/win_set_name_f.c | 4 ++-- 31 files changed, 60 insertions(+), 60 deletions(-) rename ompi/mpi/f77/{strings.h => f77_strings.h} (100%) diff --git a/ompi/mpi/f77/Makefile.am b/ompi/mpi/f77/Makefile.am index 3888b74f99..d0ca45cd41 100644 --- a/ompi/mpi/f77/Makefile.am +++ b/ompi/mpi/f77/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana +# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. # Copyright (c) 2004-2005 The University of Tennessee and The University @@ -82,7 +82,7 @@ headers = \ constants.h \ fint_2_int.h \ prototypes_mpi.h \ - strings.h + f77_strings.h # # libmpi_f77.la is always build because it contains some non-profilied diff --git a/ompi/mpi/f77/add_error_string_f.c b/ompi/mpi/f77/add_error_string_f.c index d2aa566688..180a15d4e8 100644 --- a/ompi/mpi/f77/add_error_string_f.c +++ b/ompi/mpi/f77/add_error_string_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -21,7 +21,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/close_port_f.c b/ompi/mpi/f77/close_port_f.c index 4c5c8f0b69..5328de6a20 100644 --- a/ompi/mpi/f77/close_port_f.c +++ b/ompi/mpi/f77/close_port_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_CLOSE_PORT = mpi_close_port_f diff --git a/ompi/mpi/f77/comm_accept_f.c b/ompi/mpi/f77/comm_accept_f.c index 6b6d57dcec..64d1047b8d 100644 --- a/ompi/mpi/f77/comm_accept_f.c +++ b/ompi/mpi/f77/comm_accept_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_COMM_ACCEPT = mpi_comm_accept_f diff --git a/ompi/mpi/f77/comm_connect_f.c b/ompi/mpi/f77/comm_connect_f.c index a0ab783bdb..102a279764 100644 --- a/ompi/mpi/f77/comm_connect_f.c +++ b/ompi/mpi/f77/comm_connect_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_COMM_CONNECT = mpi_comm_connect_f diff --git a/ompi/mpi/f77/comm_get_name_f.c b/ompi/mpi/f77/comm_get_name_f.c index d9b5ff6aa6..100b8ab8b7 100644 --- a/ompi/mpi/f77/comm_get_name_f.c +++ b/ompi/mpi/f77/comm_get_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpi/f77/comm_set_name_f.c b/ompi/mpi/f77/comm_set_name_f.c index 252f94487c..aeefcd04ba 100644 --- a/ompi/mpi/f77/comm_set_name_f.c +++ b/ompi/mpi/f77/comm_set_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -21,7 +21,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_COMM_SET_NAME = mpi_comm_set_name_f diff --git a/ompi/mpi/f77/comm_spawn_f.c b/ompi/mpi/f77/comm_spawn_f.c index ec5d0b96e6..d158c4eefc 100644 --- a/ompi/mpi/f77/comm_spawn_f.c +++ b/ompi/mpi/f77/comm_spawn_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "opal/util/argv.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/comm_spawn_multiple_f.c b/ompi/mpi/f77/comm_spawn_multiple_f.c index 367828742b..1cd39e8446 100644 --- a/ompi/mpi/f77/comm_spawn_multiple_f.c +++ b/ompi/mpi/f77/comm_spawn_multiple_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "opal/util/argv.h" diff --git a/ompi/mpi/f77/error_string_f.c b/ompi/mpi/f77/error_string_f.c index bbc739c657..9da950adc5 100644 --- a/ompi/mpi/f77/error_string_f.c +++ b/ompi/mpi/f77/error_string_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpi/f77/strings.h b/ompi/mpi/f77/f77_strings.h similarity index 100% rename from ompi/mpi/f77/strings.h rename to ompi/mpi/f77/f77_strings.h diff --git a/ompi/mpi/f77/file_delete_f.c b/ompi/mpi/f77/file_delete_f.c index 9e48f109df..e8154f100e 100644 --- a/ompi/mpi/f77/file_delete_f.c +++ b/ompi/mpi/f77/file_delete_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/file_get_view_f.c b/ompi/mpi/f77/file_get_view_f.c index 32931e1eef..e1452fad23 100644 --- a/ompi/mpi/f77/file_get_view_f.c +++ b/ompi/mpi/f77/file_get_view_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/file_open_f.c b/ompi/mpi/f77/file_open_f.c index 0bbd36fc9c..bfa007b05c 100644 --- a/ompi/mpi/f77/file_open_f.c +++ b/ompi/mpi/f77/file_open_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/file_set_view_f.c b/ompi/mpi/f77/file_set_view_f.c index 8368d0fd7b..580e7cc48f 100644 --- a/ompi/mpi/f77/file_set_view_f.c +++ b/ompi/mpi/f77/file_set_view_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/get_processor_name_f.c b/ompi/mpi/f77/get_processor_name_f.c index b6ef576b15..bd3ff741f3 100644 --- a/ompi/mpi/f77/get_processor_name_f.c +++ b/ompi/mpi/f77/get_processor_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_GET_PROCESSOR_NAME = mpi_get_processor_name_f diff --git a/ompi/mpi/f77/info_delete_f.c b/ompi/mpi/f77/info_delete_f.c index 24299329e9..b38c6a1575 100644 --- a/ompi/mpi/f77/info_delete_f.c +++ b/ompi/mpi/f77/info_delete_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_INFO_DELETE = mpi_info_delete_f diff --git a/ompi/mpi/f77/info_get_f.c b/ompi/mpi/f77/info_get_f.c index 68f4d9efed..c3cfa5b870 100644 --- a/ompi/mpi/f77/info_get_f.c +++ b/ompi/mpi/f77/info_get_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_INFO_GET = mpi_info_get_f diff --git a/ompi/mpi/f77/info_get_nthkey_f.c b/ompi/mpi/f77/info_get_nthkey_f.c index 5cb85aa800..cc245ea5d9 100644 --- a/ompi/mpi/f77/info_get_nthkey_f.c +++ b/ompi/mpi/f77/info_get_nthkey_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_INFO_GET_NTHKEY = mpi_info_get_nthkey_f diff --git a/ompi/mpi/f77/info_get_valuelen_f.c b/ompi/mpi/f77/info_get_valuelen_f.c index 410ffa5e10..e75c762f26 100644 --- a/ompi/mpi/f77/info_get_valuelen_f.c +++ b/ompi/mpi/f77/info_get_valuelen_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_INFO_GET_VALUELEN = mpi_info_get_valuelen_f diff --git a/ompi/mpi/f77/info_set_f.c b/ompi/mpi/f77/info_set_f.c index 60a83e9add..8601ea8298 100644 --- a/ompi/mpi/f77/info_set_f.c +++ b/ompi/mpi/f77/info_set_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_INFO_SET = mpi_info_set_f diff --git a/ompi/mpi/f77/lookup_name_f.c b/ompi/mpi/f77/lookup_name_f.c index b093b2d4ae..4af550d810 100644 --- a/ompi/mpi/f77/lookup_name_f.c +++ b/ompi/mpi/f77/lookup_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_LOOKUP_NAME = mpi_lookup_name_f diff --git a/ompi/mpi/f77/open_port_f.c b/ompi/mpi/f77/open_port_f.c index 4872e51cc4..7333279e1a 100644 --- a/ompi/mpi/f77/open_port_f.c +++ b/ompi/mpi/f77/open_port_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_OPEN_PORT = mpi_open_port_f diff --git a/ompi/mpi/f77/publish_name_f.c b/ompi/mpi/f77/publish_name_f.c index e4236111fc..839f1fff8f 100644 --- a/ompi/mpi/f77/publish_name_f.c +++ b/ompi/mpi/f77/publish_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_PUBLISH_NAME = mpi_publish_name_f diff --git a/ompi/mpi/f77/register_datarep_f.c b/ompi/mpi/f77/register_datarep_f.c index 25681f4b0a..78272433c4 100644 --- a/ompi/mpi/f77/register_datarep_f.c +++ b/ompi/mpi/f77/register_datarep_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/strings.c b/ompi/mpi/f77/strings.c index 7dd36c36ec..d2d874f086 100644 --- a/ompi/mpi/f77/strings.c +++ b/ompi/mpi/f77/strings.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -24,7 +24,7 @@ #include "ompi/constants.h" #include "opal/util/argv.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" /* diff --git a/ompi/mpi/f77/type_get_name_f.c b/ompi/mpi/f77/type_get_name_f.c index 0eaee485f2..67e837b12b 100644 --- a/ompi/mpi/f77/type_get_name_f.c +++ b/ompi/mpi/f77/type_get_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/errhandler/errhandler.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_TYPE_GET_NAME = mpi_type_get_name_f diff --git a/ompi/mpi/f77/type_set_name_f.c b/ompi/mpi/f77/type_set_name_f.c index 6583506b83..c9fe82f2b9 100644 --- a/ompi/mpi/f77/type_set_name_f.c +++ b/ompi/mpi/f77/type_set_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/constants.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_TYPE_SET_NAME = mpi_type_set_name_f diff --git a/ompi/mpi/f77/unpublish_name_f.c b/ompi/mpi/f77/unpublish_name_f.c index 44bdba3027..77c5471194 100644 --- a/ompi/mpi/f77/unpublish_name_f.c +++ b/ompi/mpi/f77/unpublish_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -19,7 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_UNPUBLISH_NAME = mpi_unpublish_name_f diff --git a/ompi/mpi/f77/win_get_name_f.c b/ompi/mpi/f77/win_get_name_f.c index 99a4c50be4..3fb859fcc5 100644 --- a/ompi/mpi/f77/win_get_name_f.c +++ b/ompi/mpi/f77/win_get_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -22,7 +22,7 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" #include "ompi/errhandler/errhandler.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/win_set_name_f.c b/ompi/mpi/f77/win_set_name_f.c index a21d1efa78..d9a6a81219 100644 --- a/ompi/mpi/f77/win_set_name_f.c +++ b/ompi/mpi/f77/win_set_name_f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University @@ -20,7 +20,7 @@ #include "ompi/constants.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/mpi/f77/strings.h" +#include "ompi/mpi/f77/f77_strings.h" #include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER