Index: ../trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp	(revision 24773)
+++ ../trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp	(revision 24774)
@@ -13,6 +13,11 @@
 #include <cstring> // for memcpy
 
 #include "./issmmpi.h"
+
+#if defined(_HAVE_MPI_) && defined(_HAVE_CODIPACK_)
+MpiTypes* mpiTypes;
+#endif
+
 #include "../../shared/Numerics/types.h"
 
 #ifndef _HAVE_MPI_
@@ -35,17 +40,7 @@
   }
   return 0;
 }/*}}}*/
-#else
-#if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
-#if defined(_HAVE_ADJOINTMPI_)
-#if defined(_HAVE_MEDIPACK_)
-#if defined(_HAVE_CODIPACK_)
-MpiTypes* mpiTypes;
 #endif
-#endif
-#endif
-#endif
-#endif
 
 int ISSM_MPI_Allgather(void *sendbuf, int sendcount, ISSM_MPI_Datatype sendtype, void *recvbuf, int recvcount, ISSM_MPI_Datatype recvtype, ISSM_MPI_Comm comm) {  /*{{{*/
   int rc=0;