yet another attempt to handle MPI special values in fortran

[simgrid.git] / include / smpi / mpif.h.in

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index 580f2b3..68d4777 100644 (file)
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -1,5 +1,5 @@
 ! -*- fortran -*-
-! Copyright (c) 2010, 2012-2014. The SimGrid Team.
+! Copyright (c) 2010-2019. The SimGrid Team.
 ! All rights reserved.
 
 ! This program is free software; you can redistribute it and/or modify it
@@ -79,14 +79,15 @@
       integer MPI_COMM_NULL_COPY_FN, MPI_COMM_NULL_DELETE_FN
       parameter(MPI_COMM_NULL_COPY_FN =0)
       parameter(MPI_COMM_NULL_DELETE_FN =0)
-      integer MPI_COMM_NULL_DUP_FN, MPI_COMM_DUP_FN
-      parameter(MPI_COMM_NULL_DUP_FN =0)
-      parameter(MPI_COMM_DUP_FN =0)
-      integer MPI_WIN_NULL_COPY_FN, MPI_WIN_NULL_DELETE_FN
-      parameter(MPI_WIN_NULL_COPY_FN =0)
+      integer MPI_COMM_DUP_FN
+      parameter(MPI_COMM_DUP_FN =1)
+      integer MPI_WIN_NULL_DELETE_FN
       parameter(MPI_WIN_NULL_DELETE_FN =0)
-      integer MPI_WIN_DUP_FN
-      parameter(MPI_WIN_DUP_FN =0)
+      integer MPI_TYPE_NULL_COPY_FN, MPI_TYPE_NULL_DELETE_FN
+      parameter(MPI_TYPE_NULL_COPY_FN =0)
+      parameter(MPI_TYPE_NULL_DELETE_FN =0)
+      integer MPI_TYPE_DUP_FN
+      parameter(MPI_TYPE_DUP_FN =1)
 
       integer MPI_ROOT, MPI_COMM_TYPE_SHARED
       parameter(MPI_ROOT=0)
@@ -113,20 +114,13 @@
 
 ! This should be equal to the number of int fields in MPI_Status
       integer MPI_STATUS_SIZE
-      parameter(MPI_STATUS_SIZE=4)
+      parameter(MPI_STATUS_SIZE=5)
 
       integer MPI_INTEGER_KIND
       parameter(MPI_INTEGER_KIND=4)
 
-      integer MPI_IN_PLACE
-      parameter(MPI_IN_PLACE=-100)
-      integer MPI_BOTTOM
-      parameter(MPI_BOTTOM=-200)
-      integer MPI_STATUS_IGNORE
-      parameter(MPI_STATUS_IGNORE=-300)
-      integer MPI_STATUSES_IGNORE
-      parameter(MPI_STATUSES_IGNORE=-400)
-
+      external MPI_IN_PLACE, MPI_BOTTOM
+      external MPI_STATUS_IGNORE, MPI_STATUSES_IGNORE
 
       integer MPI_BYTE, MPI_CHARACTER, MPI_LOGICAL
       integer MPI_INTEGER, MPI_INTEGER1, MPI_INTEGER2, MPI_INTEGER4
@@ -165,7 +159,7 @@
       parameter(MPI_WIN_DISP_UNIT=-3)
 
 ! These IDs have to be unique, consecutive
-! and ordered as in smpi_f77.cpp. 
+! and ordered as in smpi_f77.cpp.
       parameter(MPI_COMM_WORLD=0)
 
       parameter(MPI_BYTE=1)
@@ -270,6 +264,7 @@
       external MPI_BCAST, MPI_BARRIER, MPI_REDUCE, MPI_ALLREDUCE
       external MPI_SCATTER, MPI_GATHER, MPI_ALLGATHER, MPI_SCAN
       external MPI_ALLTOALL, MPI_GATHERV, MPI_SENDRECV
+      external MPI_WIN_DUP_FN, MPI_WIN_NULL_COPY_FN
 
       external MPI_WTIME
       external MPI_WTICK