Try to get rid of some old and weird way of doing things for fortran.

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

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index 38d423b..98747c2 100644 (file)
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -35,8 +35,8 @@
       parameter(MPI_SOURCE=1)
       parameter(MPI_TAG=2)
       parameter(MPI_ERROR=3)
-      parameter(MPI_VERSION=1)
-      parameter(MPI_SUBVERSION=1)
+      parameter(MPI_VERSION=2)
+      parameter(MPI_SUBVERSION=2)
       parameter(MPI_LOCK_EXCLUSIVE=1)
       parameter(MPI_LOCK_SHARED=2)
       integer MPI_MODE_NOSTORE, MPI_MODE_NOPUT, MPI_MODE_NOPRECEDE
@@ -125,10 +125,15 @@
       parameter(MPI_STATUS_SIZE=4)
 
 ! These should be ordered as in smpi_f77.c
-      integer MPI_IN_PLACE, MPI_BOTTOM
-      integer MPI_STATUS_IGNORE, MPI_STATUSES_IGNORE
-      common /smpi/ MPI_IN_PLACE, MPI_BOTTOM
-      common /smpi/ MPI_STATUS_IGNORE, MPI_STATUSES_IGNORE
+
+      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)
 
       integer MPI_REQUEST_NULL
       parameter(MPI_REQUEST_NULL=-1)
@@ -166,15 +171,15 @@
       parameter(MPI_LOGICAL4=17)
       parameter(MPI_LOGICAL8=18)
       parameter(MPI_2REAL=19)
-      parameter(MPI_2DOUBLE_PRECISION=19)
-      parameter(MPI_AINT=20)
-      parameter(MPI_OFFSET=21)
-      parameter(MPI_COUNT=22)
-      parameter(MPI_REAL16=23)
-      parameter(MPI_COMPLEX8=24)
-      parameter(MPI_COMPLEX16=25)
-      parameter(MPI_COMPLEX32=26)
-      parameter(MPI_PACKED=27)
+      parameter(MPI_2DOUBLE_PRECISION=20)
+      parameter(MPI_AINT=21)
+      parameter(MPI_OFFSET=22)
+      parameter(MPI_COUNT=23)
+      parameter(MPI_REAL16=24)
+      parameter(MPI_COMPLEX8=25)
+      parameter(MPI_COMPLEX16=26)
+      parameter(MPI_COMPLEX32=27)
+      parameter(MPI_PACKED=28)
 
 ! These should be ordered as in smpi_f77.c
       integer MPI_OP_NULL,MPI_MAX, MPI_MIN, MPI_MAXLOC, MPI_MINLOC
@@ -229,6 +234,20 @@
       parameter( MPI_COMBINER_RESIZED=17)
       parameter( MPI_COMBINER_HINDEXED_BLOCK=18)
 
+      integer MPI_MODE_RDONLY, MPI_MODE_RDWR, MPI_MODE_WRONLY
+      integer MPI_MODE_CREATE, MPI_MODE_EXCL, MPI_MODE_DELETE_ON_CLOSE
+      integer MPI_MODE_UNIQUE_OPEN, MPI_MODE_APPEND, MPI_MODE_SEQUENTIAL
+
+      parameter( MPI_MODE_RDONLY=2)
+      parameter( MPI_MODE_RDWR=8)
+      parameter( MPI_MODE_WRONLY=4)
+      parameter( MPI_MODE_CREATE=1)
+      parameter( MPI_MODE_EXCL=64)
+      parameter( MPI_MODE_DELETE_ON_CLOSE=16)
+      parameter( MPI_MODE_UNIQUE_OPEN=32)
+      parameter( MPI_MODE_APPEND=128)
+      parameter( MPI_MODE_SEQUENTIAL=256)
+
       integer MPI_ORDER_C, MPI_ORDER_FORTRAN
       parameter(MPI_ORDER_C=1)
       parameter(MPI_ORDER_FORTRAN=0)