Warning fixes:

        * Makefile.in (lang.o): Depend on $(RTL_H) $(EXPR_H).

        * expr.c (java_stack_pop, java_array_data_offset,
        build_java_throw_out_of_bounds_exception, case_identity,
        build_java_check_indexed_type): Add static prototypes.
        (linenumber_table, expand_invoke, expand_java_field_op,
        build_primtype_type_ref, expand_byte_code): Constify a char*.

        * java-tree.h (build_primtype_type_ref, linenumber_table):
        Constify a char*.
        (java_lang_expand_expr): Add prototype.

        * lang.c: Include rtl.h and expr.h.  Remove extern prototype for
        `java_lang_expand_expr'.

        * lex.c (java_lex_error): Constify a char*.
        (java_get_unicode, java_read_char, java_allocate_new_line,
        java_unget_unicode, java_sneak_unicode): Prototype.

        * parse-scan.y (current_class, package_name, method_declarator,
        report_class_declaration, yyerror): Constify a char*.

        * parse.h (java_report_errors): Prototype.
        (yyerror): Constify a char*.

        * parse.y (classitf_redefinition_error, check_modifiers,
        parse_jdk1_1_error, lookup_package_type,
        lookup_package_type_and_set_next, get_printable_method_name,
        purify_type_name): Constify a char*.
        (build_super_invocation, maybe_generate_finit,
        verify_constructor_super, parser_add_interface,
        add_superinterfaces, jdep_resolve_class, note_possible_classname,
        java_complete_expand_methods, java_expand_finals,
        cut_identifier_in_qualified, java_stabilize_reference,
        do_unary_numeric_promotion, operator_string, do_merge_string_cste,
        merge_string_cste): Prototype.
        (single_type_import_declaration, yyerror,
        variable_redefinition_error, build_array_from_name,
        build_unresolved_array_type, check_class_interface_creation,
        resolve_class, complete_class_report_errors,
        note_possible_classname, read_import_dir,
        find_in_imports_on_demand, resolve_package, fix_constructors,
        check_deprecation, lookup_method_invoke,
        maybe_build_primttype_type_ref, array_constructor_check_entry):
        Constify a char*.
        (java_complete_expand_methods, java_expand_finals): Make static.
        (convert_narrow): Remove static prototype.

From-SVN: r28498

1 files changed, 11 insertions, 6 deletions

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 8b98fbf..59376a1 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -74,6 +74,11 @@ static tree pop_arguments PROTO ((tree));
 static void expand_invoke PROTO ((int, int, int)); 
 static void expand_java_field_op PROTO ((int, int, int)); 
 static void java_push_constant_from_pool PROTO ((struct JCF *, int)); 
+static void java_stack_pop PROTO ((int)); 
+static tree build_java_throw_out_of_bounds_exception PROTO ((tree)); 
+static tree build_java_check_indexed_type PROTO ((tree, tree)); 
+static tree java_array_data_offset PROTO ((tree)); 
+static tree case_identity PROTO ((tree, tree)); 
  
 static tree operand_type[59];
 extern struct obstack permanent_obstack;
@@ -125,7 +130,7 @@ tree tree_list_free_list = NULL_TREE;
 
 int stack_pointer;
 
-unsigned char *linenumber_table;
+const unsigned char *linenumber_table;
 int linenumber_count;
 
 tree
@@ -1630,7 +1635,7 @@ expand_invoke (opcode, method_ref_index, nargs)
   tree method_name = COMPONENT_REF_NAME (&current_jcf->cpool, method_ref_index);
   tree self_type = get_class_constant
     (current_jcf, COMPONENT_REF_CLASS_INDEX(&current_jcf->cpool, method_ref_index));
-  char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
+  const char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
   tree call, func, method, arg_list, method_type;
 
   if (! CLASS_LOADED_P (self_type))
@@ -1738,7 +1743,7 @@ expand_java_field_op (is_static, is_putting, field_ref_index)
       get_class_constant (current_jcf, 
 			  COMPONENT_REF_CLASS_INDEX (&current_jcf->cpool, 
 						     field_ref_index));
-  char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
+  const char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
   tree field_name = COMPONENT_REF_NAME (&current_jcf->cpool, field_ref_index);
   tree field_signature = COMPONENT_REF_SIGNATURE (&current_jcf->cpool, 
 						  field_ref_index);
@@ -1820,9 +1825,9 @@ expand_java_field_op (is_static, is_putting, field_ref_index)
 
 tree
 build_primtype_type_ref (self_name)
-    char *self_name;
+    const char *self_name;
 {
-  char *class_name = self_name+10;
+  const char *class_name = self_name+10;
   tree typ;
   if (strncmp(class_name, "Byte", 4) == 0)
     typ = byte_type_node;
@@ -2043,7 +2048,7 @@ expand_byte_code (jcf, method)
   int PC;
   int i;
   int saw_index;
-  unsigned char *linenumber_pointer;
+  const unsigned char *linenumber_pointer;
   int dead_code_index = -1;
 
 #undef RET /* Defined by config/i386/i386.h */