diff --git a/src/mca/io/romio/src/io_romio_file_open.c b/src/mca/io/romio/src/io_romio_file_open.c index 806f2aea76..5b3e378995 100644 --- a/src/mca/io/romio/src/io_romio_file_open.c +++ b/src/mca/io/romio/src/io_romio_file_open.c @@ -157,8 +157,8 @@ mca_io_romio_file_get_info (ompi_file_t *fh, int mca_io_romio_file_set_view (ompi_file_t *fh, MPI_Offset disp, - ompi_datatype_t *etype, - ompi_datatype_t *filetype, + struct ompi_datatype_t *etype, + struct ompi_datatype_t *filetype, char *datarep, ompi_info_t *info) { @@ -179,8 +179,8 @@ mca_io_romio_file_set_view (ompi_file_t *fh, int mca_io_romio_file_get_view (ompi_file_t *fh, MPI_Offset * disp, - ompi_datatype_t ** etype, - ompi_datatype_t ** filetype, + struct ompi_datatype_t ** etype, + struct ompi_datatype_t ** filetype, char *datarep) { int ret; @@ -200,7 +200,7 @@ mca_io_romio_file_get_view (ompi_file_t *fh, int mca_io_romio_file_get_type_extent (ompi_file_t *fh, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, MPI_Aint * extent) { int ret; diff --git a/src/mca/io/romio/src/io_romio_file_read.c b/src/mca/io/romio/src/io_romio_file_read.c index bb44839195..1afccee9dc 100644 --- a/src/mca/io/romio/src/io_romio_file_read.c +++ b/src/mca/io/romio/src/io_romio_file_read.c @@ -26,7 +26,7 @@ mca_io_romio_file_read_at (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -48,7 +48,7 @@ mca_io_romio_file_read_at_all (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -70,7 +70,7 @@ mca_io_romio_file_iread_at (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t *request) { int ret; @@ -96,7 +96,7 @@ int mca_io_romio_file_read (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -117,7 +117,7 @@ int mca_io_romio_file_read_all (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -138,7 +138,7 @@ int mca_io_romio_file_iread (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request) { int ret; @@ -164,7 +164,7 @@ int mca_io_romio_file_read_shared (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -185,7 +185,7 @@ int mca_io_romio_file_iread_shared (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request) { int ret; @@ -211,7 +211,7 @@ int mca_io_romio_file_read_ordered (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -233,7 +233,7 @@ mca_io_romio_file_read_at_all_begin (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype) + struct ompi_datatype_t *datatype) { int ret; mca_io_romio_data_t *data; @@ -270,7 +270,7 @@ int mca_io_romio_file_read_all_begin (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype) + struct ompi_datatype_t *datatype) { int ret; mca_io_romio_data_t *data; @@ -307,7 +307,7 @@ int mca_io_romio_file_read_ordered_begin (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype) + struct ompi_datatype_t *datatype) { int ret; mca_io_romio_data_t *data; diff --git a/src/mca/io/romio/src/io_romio_file_write.c b/src/mca/io/romio/src/io_romio_file_write.c index 06d660007e..911f6fe5ed 100644 --- a/src/mca/io/romio/src/io_romio_file_write.c +++ b/src/mca/io/romio/src/io_romio_file_write.c @@ -26,7 +26,7 @@ mca_io_romio_file_write_at (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -49,7 +49,7 @@ mca_io_romio_file_write_at_all (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -72,7 +72,7 @@ mca_io_romio_file_iwrite_at (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request) { int ret; @@ -101,7 +101,7 @@ int mca_io_romio_file_write (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -121,7 +121,7 @@ int mca_io_romio_file_write_all (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -141,7 +141,7 @@ int mca_io_romio_file_iwrite (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request) { int ret; @@ -167,7 +167,7 @@ int mca_io_romio_file_write_shared (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -187,7 +187,7 @@ int mca_io_romio_file_iwrite_shared (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, mca_io_base_request_t * request) { int ret; @@ -212,7 +212,7 @@ int mca_io_romio_file_write_ordered (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype, + struct ompi_datatype_t *datatype, ompi_status_public_t * status) { int ret; @@ -233,7 +233,7 @@ mca_io_romio_file_write_at_all_begin (ompi_file_t *fh, MPI_Offset offset, void *buf, int count, - ompi_datatype_t *datatype) + struct ompi_datatype_t *datatype) { int ret; mca_io_romio_data_t *data; @@ -268,7 +268,7 @@ int mca_io_romio_file_write_all_begin (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype) + struct ompi_datatype_t *datatype) { int ret; mca_io_romio_data_t *data; @@ -302,7 +302,7 @@ int mca_io_romio_file_write_ordered_begin (ompi_file_t *fh, void *buf, int count, - ompi_datatype_t *datatype) + struct ompi_datatype_t *datatype) { int ret; mca_io_romio_data_t *data; diff --git a/src/mca/io/romio/src/io_romio_module.c b/src/mca/io/romio/src/io_romio_module.c index cff67d5811..5ef72de73c 100644 --- a/src/mca/io/romio/src/io_romio_module.c +++ b/src/mca/io/romio/src/io_romio_module.c @@ -26,7 +26,7 @@ * because ROMIO just expects this function to exist */ int MPIR_Status_set_bytes(ompi_status_public_t *status, - ompi_datatype_t *datatype, int size); + struct ompi_datatype_t *datatype, int size); /* @@ -117,7 +117,7 @@ mca_io_base_module_1_0_0_t mca_io_romio_module = { * MPI_Status_set_elements (almost like they planned that... hmmm...). */ int MPIR_Status_set_bytes(ompi_status_public_t *status, - ompi_datatype_t *datatype, int nbytes) + struct ompi_datatype_t *datatype, int nbytes) { MPI_Status_set_elements(status, datatype, nbytes); return MPI_SUCCESS;