diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-01-03 20:01:30 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-01-03 20:01:30 +0200 |
| commit | 84aff3c2d4b487fe93f5caa6351c47d56145a6a1 (patch) | |
| tree | 09d627d26346335c50d501ba2f2e2f39094071bc /libgfortran/io/transfer.c | |
| parent | 47f2abdd0d8bc3a760041149a93e35bc5db9d54e (diff) | |
| download | gcc-84aff3c2d4b487fe93f5caa6351c47d56145a6a1.zip gcc-84aff3c2d4b487fe93f5caa6351c47d56145a6a1.tar.gz gcc-84aff3c2d4b487fe93f5caa6351c47d56145a6a1.tar.bz2 | |
PR 78534 Revert r244011
r244011 caused regressions on 32-bit hosts.
From-SVN: r244027
Diffstat (limited to 'libgfortran/io/transfer.c')
| -rw-r--r-- | libgfortran/io/transfer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 9724ccb..b47f4e0 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -93,17 +93,17 @@ export_proto(transfer_logical); extern void transfer_logical_write (st_parameter_dt *, void *, int); export_proto(transfer_logical_write); -extern void transfer_character (st_parameter_dt *, void *, gfc_charlen_type); +extern void transfer_character (st_parameter_dt *, void *, int); export_proto(transfer_character); -extern void transfer_character_write (st_parameter_dt *, void *, gfc_charlen_type); +extern void transfer_character_write (st_parameter_dt *, void *, int); export_proto(transfer_character_write); -extern void transfer_character_wide (st_parameter_dt *, void *, gfc_charlen_type, int); +extern void transfer_character_wide (st_parameter_dt *, void *, int, int); export_proto(transfer_character_wide); extern void transfer_character_wide_write (st_parameter_dt *, - void *, gfc_charlen_type, int); + void *, int, int); export_proto(transfer_character_wide_write); extern void transfer_complex (st_parameter_dt *, void *, int); @@ -2272,7 +2272,7 @@ transfer_logical_write (st_parameter_dt *dtp, void *p, int kind) } void -transfer_character (st_parameter_dt *dtp, void *p, gfc_charlen_type len) +transfer_character (st_parameter_dt *dtp, void *p, int len) { static char *empty_string[0]; @@ -2290,13 +2290,13 @@ transfer_character (st_parameter_dt *dtp, void *p, gfc_charlen_type len) } void -transfer_character_write (st_parameter_dt *dtp, void *p, gfc_charlen_type len) +transfer_character_write (st_parameter_dt *dtp, void *p, int len) { transfer_character (dtp, p, len); } void -transfer_character_wide (st_parameter_dt *dtp, void *p, gfc_charlen_type len, int kind) +transfer_character_wide (st_parameter_dt *dtp, void *p, int len, int kind) { static char *empty_string[0]; @@ -2314,7 +2314,7 @@ transfer_character_wide (st_parameter_dt *dtp, void *p, gfc_charlen_type len, in } void -transfer_character_wide_write (st_parameter_dt *dtp, void *p, gfc_charlen_type len, int kind) +transfer_character_wide_write (st_parameter_dt *dtp, void *p, int len, int kind) { transfer_character_wide (dtp, p, len, kind); } @@ -2351,7 +2351,7 @@ transfer_array (st_parameter_dt *dtp, gfc_array_char *desc, int kind, return; iotype = (bt) GFC_DESCRIPTOR_TYPE (desc); - size = iotype == BT_CHARACTER ? (index_type) charlen : GFC_DESCRIPTOR_SIZE (desc); + size = iotype == BT_CHARACTER ? charlen : GFC_DESCRIPTOR_SIZE (desc); rank = GFC_DESCRIPTOR_RANK (desc); for (n = 0; n < rank; n++) |