X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9913f5c6e9c50cf462f1e60adffdc800fe339a12..bace8e5a6ff160e200f799250796c5303dc487ba:/include/smpi/mpif.h.in diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in index 84adf9356e..38d423ba2d 100644 --- a/include/smpi/mpif.h.in +++ b/include/smpi/mpif.h.in @@ -73,7 +73,6 @@ parameter(MPI_UNEQUAL=2) parameter(MPI_CONGRUENT=3) - integer MPI_NULL_COPY_FN, MPI_NULL_DELETE_FN parameter(MPI_NULL_COPY_FN =0) parameter(MPI_NULL_DELETE_FN =0) @@ -84,8 +83,6 @@ parameter(MPI_COMM_NULL_DUP_FN =0) parameter(MPI_COMM_DUP_FN =0) - - integer MPI_ROOT, MPI_INFO_NULL,MPI_COMM_TYPE_SHARED parameter(MPI_ROOT=0) parameter(MPI_INFO_NULL=0) @@ -179,8 +176,6 @@ parameter(MPI_COMPLEX32=26) parameter(MPI_PACKED=27) - - ! These should be ordered as in smpi_f77.c integer MPI_OP_NULL,MPI_MAX, MPI_MIN, MPI_MAXLOC, MPI_MINLOC integer MPI_SUM, MPI_PROD, MPI_LAND, MPI_LOR, MPI_LXOR, MPI_BAND @@ -198,10 +193,10 @@ parameter(MPI_BAND=9) parameter(MPI_BOR=10) parameter(MPI_BXOR=11) - + INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND - PARAMETER (MPI_ADDRESS_KIND=@MPI_ADDRESS_SIZE@) - PARAMETER (MPI_OFFSET_KIND=@MPI_ADDRESS_SIZE@) + PARAMETER (MPI_ADDRESS_KIND=@CMAKE_SIZEOF_VOID_P@) + PARAMETER (MPI_OFFSET_KIND=@CMAKE_SIZEOF_VOID_P@) integer MPI_COMBINER_NAMED, MPI_COMBINER_DUP integer MPI_COMBINER_CONTIGUOUS, MPI_COMBINER_VECTOR