Index: /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h	(revision 27372)
+++ /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h	(revision 27373)
@@ -68,15 +68,19 @@
 	// types
 	#if defined(_HAVE_MEDIPACK_) && !defined(_WRAPPERS_)
-	typedef AMPI_Comm             ISSM_MPI_Comm;
-	typedef AMPI_Datatype         ISSM_MPI_Datatype;
-	typedef AMPI_Op               ISSM_MPI_Op;
-	typedef AMPI_Status           ISSM_MPI_Status;
-	typedef AMPI_Request          ISSM_MPI_Request;
-	#else
-	typedef MPI_Comm             ISSM_MPI_Comm;
-	typedef MPI_Datatype         ISSM_MPI_Datatype;
-	typedef MPI_Op               ISSM_MPI_Op;
-	typedef MPI_Status           ISSM_MPI_Status;
-	typedef MPI_Request          ISSM_MPI_Request;
+	typedef AMPI_Comm     ISSM_MPI_Comm;
+	typedef AMPI_Datatype ISSM_MPI_Datatype;
+	typedef AMPI_Op       ISSM_MPI_Op;
+	typedef AMPI_Status   ISSM_MPI_Status;
+	typedef AMPI_Request  ISSM_MPI_Request;
+	#else
+	typedef MPI_Comm      ISSM_MPI_Comm;
+	typedef MPI_Datatype  ISSM_MPI_Datatype;
+	typedef MPI_Op        ISSM_MPI_Op;
+	typedef MPI_Status    ISSM_MPI_Status;
+	#if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
+	typedef AMPI_Request   ISSM_MPI_Request;
+	#else
+	typedef MPI_Request  ISSM_MPI_Request;
+	#endif
 	#endif
 
@@ -130,8 +134,9 @@
 	/*Our ISSM MPI defines: {{{*/
 	// types
-	typedef int                  ISSM_MPI_Comm;
-	typedef int                  ISSM_MPI_Datatype;
-	typedef int                  ISSM_MPI_Op;
-	typedef int                  ISSM_MPI_Status;
+	typedef int  ISSM_MPI_Comm;
+	typedef int  ISSM_MPI_Datatype;
+	typedef int  ISSM_MPI_Op;
+	typedef int  ISSM_MPI_Status;
+	typedef int  ISSM_MPI_Request;
 
 	// data types