Author: goodell Date: 2012-11-20 16:20:51 -0600 (Tue, 20 Nov 2012) New Revision: 10632 Modified: mpich2/trunk/src/mpi/romio/adio/common/status_setb.c Log: ROMIO: fix overzealous MPICH2->MPICH change Partially reviewed by robl@ & balaji@. Modified: mpich2/trunk/src/mpi/romio/adio/common/status_setb.c =================================================================== --- mpich2/trunk/src/mpi/romio/adio/common/status_setb.c 2012-11-20 22:14:18 UTC (rev 10631) +++ mpich2/trunk/src/mpi/romio/adio/common/status_setb.c 2012-11-20 22:20:51 UTC (rev 10632) @@ -8,7 +8,7 @@ #include "adio.h" #include "mpi.h" -#if defined(MPICH) +#if defined(MPICH2) || (defined(MPICH) && (MPICH_NAME >= 3)) /* Not quite correct, but much closer for MPI2 */ /* TODO: still needs to handle partial datatypes and situations where the mpi * implementation fills status with something other than bytes (globus2 might @@ -23,20 +23,6 @@ MPI_Status_set_elements(status, MPI_BYTE, nbytes); return MPI_SUCCESS; } -#elif defined(MPICH) - -void MPID_Status_set_bytes(MPI_Status *status, int nbytes); -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - int nbytes); - -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - int nbytes) -{ - if (status != MPI_STATUS_IGNORE) - MPID_Status_set_bytes(status, nbytes); - return MPI_SUCCESS; -} - #elif defined(MPILAM) || defined(MPISGI) int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, int nbytes)