aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorOlivier Hainque <hainque@adacore.com>2008-07-30 07:44:09 +0000
committerOlivier Hainque <hainque@gcc.gnu.org>2008-07-30 07:44:09 +0000
commit473e10621f06ef6cfd82f3875224c4b82c2eb7cf (patch)
tree5e51c8843a15f222aee2c5686f72ccdd40da0109 /gcc
parenta7dafa20688ef5d60d8212ce9ef6dd74d7bb2e9a (diff)
downloadgcc-473e10621f06ef6cfd82f3875224c4b82c2eb7cf.zip
gcc-473e10621f06ef6cfd82f3875224c4b82c2eb7cf.tar.gz
gcc-473e10621f06ef6cfd82f3875224c4b82c2eb7cf.tar.bz2
scan.c (make_sstring_space): Add explicit conversions of allocator's return value.
* scan.c (make_sstring_space): Add explicit conversions of allocator's return value. * fix-header.c (recognized_function): Likewise. From-SVN: r138295
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/fix-header.c5
-rw-r--r--gcc/scan.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3efe93..19e2f3b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-30 Olivier Hainque <hainque@adacore.com>
+
+ * scan.c (make_sstring_space): Add explicit conversions of
+ allocator's return value.
+ * fix-header.c (recognized_function): Likewise.
+
2008-07-30 Laurent Guerby <laurent@guerby.net>
PR ada/5911
diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index f691e4e..5402e94 100644
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -562,7 +562,10 @@ recognized_function (const cpp_token *fname, unsigned int line, int kind,
/* We only have a partial function declaration,
so remember that we have to add a complete prototype. */
partial_count++;
- partial = obstack_alloc (&scan_file_obstack, sizeof (struct partial_proto));
+ partial
+ = (struct partial_proto *)
+ obstack_alloc (&scan_file_obstack,
+ sizeof (struct partial_proto));
partial->line_seen = line;
partial->fn = fn;
fn->partial = partial;
diff --git a/gcc/scan.c b/gcc/scan.c
index f697d26..c6d0471 100644
--- a/gcc/scan.c
+++ b/gcc/scan.c
@@ -35,7 +35,7 @@ make_sstring_space (sstring *str, int count)
if (new_size <= cur_size)
return;
- str->base = xrealloc (str->base, new_size);
+ str->base = (char *) xrealloc (str->base, new_size);
str->ptr = str->base + cur_size;
str->limit = str->base + new_size;
}