From 87ec6c53847cb774c8617d167659820bbc751a84 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 21 Jun 2006 21:24:01 +0000 Subject: [PATCH] Fix the fix -- if we're not compiling the profiling layer, then we cannot include the PMPI_WTIME|WTICK functions in the external and double precision statements because some compilers complain about this. Instead, we need to use the macro that is defined by configure.ac (MPIF_H_PMPI_W_FUNCS). This unfortunately means that we need to generate mpif.h (in addition to mpif-config.h) because the "external" statement is toxic to F90 compilers. This commit was SVN r10464. --- configure.ac | 1 + ompi/include/{mpif.h => mpif.h.in} | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename ompi/include/{mpif.h => mpif.h.in} (96%) diff --git a/configure.ac b/configure.ac index 173a5d6063..35971a4a6b 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,6 +1107,7 @@ AC_CONFIG_FILES([ ompi/Makefile ompi/etc/Makefile ompi/include/Makefile + ompi/include/mpif.h ompi/include/mpif-config.h ompi/datatype/Makefile diff --git a/ompi/include/mpif.h b/ompi/include/mpif.h.in similarity index 96% rename from ompi/include/mpif.h rename to ompi/include/mpif.h.in index 8e6a80363d..014ca932e7 100644 --- a/ompi/include/mpif.h +++ b/ompi/include/mpif.h.in @@ -74,6 +74,6 @@ ! ! double precision functions ! - external MPI_WTIME, MPI_WTICK - double precision MPI_WTIME, MPI_WTICK + external MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@ + double precision MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@