diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b19bc570c350ff952c88ea549fefe3cc7ee18a4f..1c4743f7d437caa8bd571f44d32e2f19e0e9b647 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* jcf-write.c (CHECK_PUT): Add static prototype.  Make pointer
+	types the same in comparison.
+	(CHECK_OP): Add static prototype.
+
 2000-06-13  Jakub Jelinek  <jakub@redhat.com>
 
 	* typeck.c (build_java_array_type): Set TYPE_USER_ALIGN.
diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index 64e490581ecfbf601054ee2eb87f00b263d76c3d..483a4a909b1919a436ce382b4e996dd06db719d9 100644
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -348,14 +348,16 @@ static void append_innerclasses_attribute_entry PARAMS ((struct jcf_partial *, t
    write next, and we assume enoygh space has been allocated. */
 
 #ifdef ENABLE_CHECKING
-int
+static int CHECK_PUT PARAMS ((void *, struct jcf_partial *, int));
+
+static int
 CHECK_PUT(ptr, state, i)
      void *ptr;
      struct jcf_partial *state;
      int i;
 {
-  if (ptr < state->chunk->data
-      || (char*)ptr + i > state->chunk->data + state->chunk->size)
+  if ((unsigned char *)ptr < state->chunk->data
+      || (unsigned char*)ptr + i > state->chunk->data + state->chunk->size)
     fatal ("internal error - CHECK_PUT failed");
   return 0;
 }
@@ -402,7 +404,9 @@ alloc_chunk (last, data, size, work)
 }
 
 #ifdef ENABLE_CHECKING
-int
+static int CHECK_OP PARAMS ((struct jcf_partial *));
+
+static int
 CHECK_OP(struct jcf_partial *state)
 {
   if (state->bytecode.ptr > state->bytecode.limit)