Merge branch 'master' into clean_events

[simgrid.git] / teshsuite / smpi / isp / umpire / partial-recv.c

diff --git a/teshsuite/smpi/isp/umpire/partial-recv.c b/teshsuite/smpi/isp/umpire/partial-recv.c
index 669021d..ae43cf8 100644 (file)
--- a/teshsuite/smpi/isp/umpire/partial-recv.c
+++ b/teshsuite/smpi/isp/umpire/partial-recv.c
@@ -39,13 +39,15 @@ main (int argc, char **argv)
 {
   int nprocs = -1;
   int rank = -1;
-  int comm = MPI_COMM_WORLD;
+  MPI_Comm comm = MPI_COMM_WORLD;
   char processor_name[128];
   int namelen = 128;
-  int i, basic_extent;
-  int blocklens[3], displs[3];
-  MPI_Datatype structtypes[3]; 
-  MPI_Datatype newtype[2]; 
+  int i;
+  MPI_Aint basic_extent;
+  int blocklens[3];
+  MPI_Aint displs[3];
+  MPI_Datatype structtypes[3];
+  MPI_Datatype newtype[2];
   MPI_Request aReq[2];
   MPI_Status aStatus[2];
   test_small_struct_t small_struct_buf[SMALL_SIZE];
@@ -65,8 +67,8 @@ main (int argc, char **argv)
   blocklens[0] = blocklens[1] = blocklens[2] = 1;
   displs[0] = 0;
   displs[1] = sizeof(double);
-  displs[2] = 
-    ((void *) &(big_struct_buf[0].the_other_double)) - 
+  displs[2] =
+    ((void *) &(big_struct_buf[0].the_other_double)) -
     ((void *) big_struct_buf);
 
   if (displs[2] < 0) displs[2] = -displs[2];
@@ -76,16 +78,16 @@ main (int argc, char **argv)
   /* create the types */
   MPI_Type_struct (2, blocklens, displs, structtypes, &newtype[0]);
   MPI_Type_struct (3, blocklens, displs, structtypes, &newtype[1]);
-  
+
   MPI_Type_extent (newtype[0], &basic_extent);
   if (basic_extent != sizeof (test_small_struct_t)) {
-    fprintf (stderr, "(%d): Unexpected extent for small struct\n");
+    fprintf (stderr, "(%d): Unexpected extent for small struct\n", rank);
     MPI_Abort (MPI_COMM_WORLD, 666);
   }
-  
+
   MPI_Type_extent (newtype[1], &basic_extent);
   if (basic_extent != sizeof (test_big_struct_t)) {
-    fprintf (stderr, "(%d): Unexpected extent for big struct\n");
+    fprintf (stderr, "(%d): Unexpected extent for big struct\n", rank);
     MPI_Abort (MPI_COMM_WORLD, 666);
   }