From bdc1937ed9b8094c8fcb835b594d67812883003f Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Sat, 6 Feb 1999 07:38:50 +0000 Subject: [PATCH] cppfiles.c (read_and_prescan): Cast the result of `xrealloc' to U_CHAR* when assigning to one. * cppfiles.c (read_and_prescan): Cast the result of `xrealloc' to U_CHAR* when assigning to one. Ensure the values of a ?: operator have the same type. * cppinit.c (initialize_char_syntax): Use K&R function definition. From-SVN: r25054 --- gcc/ChangeLog | 8 ++++++++ gcc/cppfiles.c | 7 ++++--- gcc/cppinit.c | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2c8d22c7e2f..a6576cb085f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +Sat Feb 6 10:18:01 1999 Kaveh R. Ghazi + + * cppfiles.c (read_and_prescan): Cast the result of `xrealloc' to + U_CHAR* when assigning to one. Ensure the values of a ?: operator + have the same type. + + * cppinit.c (initialize_char_syntax): Use K&R function definition. + Sat Feb 6 11:17:03 1999 Richard Earnshaw Support for ARM9 diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 9ef74f1b8f9..5092b916718 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -860,7 +860,7 @@ read_and_prescan (pfile, fp, desc, len) delta_op = op - buf; delta_line_base = line_base - buf; - buf = xrealloc (buf, len); + buf = (U_CHAR *) xrealloc (buf, len); op = buf + delta_op; line_base = buf + delta_line_base; } @@ -989,7 +989,7 @@ read_and_prescan (pfile, fp, desc, len) len += 2; if (offset + 2 > len) goto too_big; - buf = xrealloc (buf, len); + buf = (U_CHAR *) xrealloc (buf, len); op = buf + offset; } if (op[-1] == '\\') @@ -997,7 +997,8 @@ read_and_prescan (pfile, fp, desc, len) *op++ = '\n'; } - fp->buf = (len - offset < 20) ? buf : xrealloc (buf, op - buf); + fp->buf = + (U_CHAR *) ((len - offset < 20) ? (PTR) buf : xrealloc (buf, op - buf)); return op - buf; too_big: diff --git a/gcc/cppinit.c b/gcc/cppinit.c index da7030f5b1b..32ebad99805 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -51,7 +51,8 @@ U_CHAR trigraph_table[256] = { 0 }; /* Initialize syntactic classifications of characters. */ void -initialize_char_syntax (int dollar_in_ident) +initialize_char_syntax (dollar_in_ident) + int dollar_in_ident; { is_idstart['a'] = 1; is_idstart['b'] = 1; is_idstart['c'] = 1; is_idstart['d'] = 1; is_idstart['e'] = 1; is_idstart['f'] = 1; -- 2.30.2