#define MPI_2DOUBLE_PRECISION MPI_DATATYPE_NULL
#define MPI_REAL MPI_DATATYPE_NULL
#define MPI_LOGICAL MPI_DATATYPE_NULL
-#define MPI_DOUBLE_PRECISION MPI_DATATYPE_NULL
-#define MPI_INTEGER MPI_DATATYPE_NULL
+#define MPI_DOUBLE_PRECISION MPI_DOUBLE
+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
+#define MPI_INTEGER MPI_INT
+#else
+#define MPI_INTEGER MPI_LONG
+#endif
#define MPI_DISTRIBUTE_BLOCK 0
#define MPI_DISTRIBUTE_NONE 1