From b2bb2710f3e0eebda82bd3153d9fa1a32a950e7a Mon Sep 17 00:00:00 2001 From: Brendan Kehoe Date: Sat, 1 Nov 1997 19:50:18 +0000 Subject: lex.c (FILE_NAME_NONDIRECTORY): Delete macro. * lex.c (FILE_NAME_NONDIRECTORY): Delete macro. (file_name_nondirectory): New function, doing the same as the macro. (set_typedecl_interface_info): Use it instead of the macro. (check_newline): Likewise. (handle_cp_pragma): Likewise. * repo.c (get_base_filename): Cast result of rindex to char*. (open_repo_file): Likewise. * xref.c (open_xref_file): Likewise. * error.c (dump_char): Make its arg int, not char. bring over the changes that went in yesterday to fix irix6 native cc build problems From-SVN: r16261 --- gcc/cp/xref.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/cp/xref.c') diff --git a/gcc/cp/xref.c b/gcc/cp/xref.c index fc2d1078ac2..b579588a7ff 100644 --- a/gcc/cp/xref.c +++ b/gcc/cp/xref.c @@ -813,14 +813,14 @@ open_xref_file(file) #ifdef XREF_FILE_NAME XREF_FILE_NAME (xref_name, file); #else - s = rindex (file, '/'); + s = (char *) rindex (file, '/'); if (s == NULL) sprintf (xref_name, ".%s.gxref", file); else { ++s; strcpy (xref_name, file); - t = rindex (xref_name, '/'); + t = (char *) rindex (xref_name, '/'); ++t; *t++ = '.'; strcpy (t, s); -- cgit v1.2.1