diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3939e0b..85f2a5a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2007-11-23 Aldy Hernandez <aldyh@redhat.com> + + * trans-expr.c (gfc_trans_string_copy): Use "void *" when building a + memset. + 2007-11-22 Tobias Burnus <burnus@net-b.de> * primary.c (gfc_match_structure_constructor): Allow diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 6fc1e2c..c47f69b 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2701,7 +2701,7 @@ gfc_trans_string_copy (stmtblock_t * block, tree dlength, tree dest, tmp3 = build_call_expr (built_in_decls[BUILT_IN_MEMMOVE], 3, dest, src, slen); - tmp4 = fold_build2 (POINTER_PLUS_EXPR, pchar_type_node, dest, + tmp4 = fold_build2 (POINTER_PLUS_EXPR, TREE_TYPE (dest), dest, fold_convert (sizetype, slen)); tmp4 = build_call_expr (built_in_decls[BUILT_IN_MEMSET], 3, tmp4, |