aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/trans-const.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8f9cafc..82adf76 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
2018-01-31 Janne Blomqvist <jb@gcc.gnu.org>
+ * trans-const.c (gfc_conv_string_init): Use gfc_charlen_t instead
+ of int for slen.
+
+2018-01-31 Janne Blomqvist <jb@gcc.gnu.org>
+
PR fortran/78534
* trans-expr.c (fill_with_spaces): Use memset instead of
generating loop.
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 4b6adbf..07950dc 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -141,7 +141,7 @@ gfc_conv_string_init (tree length, gfc_expr * expr)
{
gfc_char_t *s;
HOST_WIDE_INT len;
- int slen;
+ gfc_charlen_t slen;
tree str;
bool free_s = false;