* 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


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@16261 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 3 deletions

diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 001a9430965..e029f90acea 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -277,7 +277,7 @@ get_base_filename (filename)
       return NULL;
     }
 
-  p = rindex (filename, '/');
+  p = (char *) rindex (filename, '/');
   if (p)
     return p+1;
   else
@@ -294,10 +294,10 @@ open_repo_file (filename)
   if (s == NULL)
     return;
 
-  p = rindex (s, '/');
+  p = (char *) rindex (s, '/');
   if (! p)
     p = s;
-  p = rindex (p, '.');
+  p = (char *) rindex (p, '.');
   if (! p)
     p = s + strlen (s);