From cf7946521395a76bafc978c02b43e78536a71c0c Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Thu, 28 Dec 2006 01:40:23 +0000 Subject: [PATCH] re PR libfortran/30014 (INQUIRE (iolength = xx) limited to kind=4) 2006-12-27 Jerry DeLisle PR libgfortran/30014 *io/io.h (st_parameter_dt): Change *size and *iolength type to GFC_IO_INT. *io/transfer.c (finalize_transfer): Cast dtp->u.p.size_used to GFC_IO_INT. (iolength_transfer): Cast size * nelems to GFC_IO_INT. From-SVN: r120234 --- libgfortran/ChangeLog | 8 ++++++++ libgfortran/io/io.h | 2 +- libgfortran/io/transfer.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index ff7adbe2da6..568049c6d22 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2006-12-27 Jerry DeLisle + + PR libgfortran/30014 + *io/io.h (st_parameter_dt): Change *size and *iolength type to + GFC_IO_INT. + *io/transfer.c (finalize_transfer): Cast dtp->u.p.size_used to + GFC_IO_INT. (iolength_transfer): Cast size * nelems to GFC_IO_INT. + 2006-12-17 Tobias Burnus * intrinsics/associated.c: Check for associated(NULL,NULL). diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index 4d227dd3b8c..314fc4cc818 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -354,7 +354,7 @@ typedef struct st_parameter_dt { st_parameter_common common; GFC_IO_INT rec; - GFC_INTEGER_4 *size, *iolength; + GFC_IO_INT *size, *iolength; gfc_array_char *internal_unit_desc; CHARACTER1 (format); CHARACTER2 (advance); diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 0139380e821..ddf5d00dac1 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -2539,7 +2539,7 @@ finalize_transfer (st_parameter_dt *dtp) GFC_INTEGER_4 cf = dtp->common.flags; if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0) - *dtp->size = (GFC_INTEGER_4) dtp->u.p.size_used; + *dtp->size = (GFC_IO_INT) dtp->u.p.size_used; if (dtp->u.p.eor_condition) { @@ -2615,7 +2615,7 @@ iolength_transfer (st_parameter_dt *dtp, bt type __attribute__((unused)), size_t size, size_t nelems) { if ((dtp->common.flags & IOPARM_DT_HAS_IOLENGTH) != 0) - *dtp->iolength += (GFC_INTEGER_4) size * nelems; + *dtp->iolength += (GFC_IO_INT) size * nelems; }