aboutsummaryrefslogtreecommitdiff
path: root/libgfortran/io/transfer.c
diff options
context:
space:
mode:
authorJanne Blomqvist <jb@gcc.gnu.org>2017-01-13 21:53:16 +0200
committerJanne Blomqvist <jb@gcc.gnu.org>2017-01-13 21:53:16 +0200
commitc1e9bbcc49c1b9f169c5911f3871f5df109bff9b (patch)
treebf815e2471d2b7f7e44d76a31e98cc1d05e07b34 /libgfortran/io/transfer.c
parentbe4aa83d6ff4720fffd2c9f62c6e3082ece1937f (diff)
downloadgcc-c1e9bbcc49c1b9f169c5911f3871f5df109bff9b.zip
gcc-c1e9bbcc49c1b9f169c5911f3871f5df109bff9b.tar.gz
gcc-c1e9bbcc49c1b9f169c5911f3871f5df109bff9b.tar.bz2
Revert r244448
From-SVN: r244454
Diffstat (limited to 'libgfortran/io/transfer.c')
-rw-r--r--libgfortran/io/transfer.c18
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++)