From: Stéphane Castelli <stephane.castelli@loria.fr>
Date: Mon, 16 Jun 2014 09:35:38 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_12~973
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3516ecc808bba20973c58b49c33dded30960613a?hp=af0238ea66e865c08a50d41d7380eb3beb2a3d7e

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/smpi/smpi_f77.c b/src/smpi/smpi_f77.c
index 1d8a6e493c..b83160f086 100644
--- a/src/smpi/smpi_f77.c
+++ b/src/smpi/smpi_f77.c
@@ -32,13 +32,13 @@ typedef unsigned long int uinteger;
     integer _MPI_BOTTOM;
     integer _MPI_STATUS_IGNORE;
     integer _MPI_STATUSES_IGNORE;
-  } smpi_f90;                       
+  } smpi_;
 
 
 
 /* Convert between Fortran and C */
 #define FORT_ADDR(addr, val)                                         \
-  (((void *)(addr) == (void*) &(smpi_f90._ ## val))                  \
+  (((void *)(addr) == (void*) &(smpi_._ ## val))                  \
    ? (val) : (void *)(addr))
 #define FORT_BOTTOM(addr)          FORT_ADDR(addr, MPI_BOTTOM)
 #define FORT_IN_PLACE(addr)        FORT_ADDR(addr, MPI_IN_PLACE)