diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1665bc62fd..780d02affa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-12  Mark Kettenis  <kettenis@gnu.org>
+
+	* objc-lang.c (print_object_command): Use gdb_byte for c.
+	* arch-utils.c (legacy_extract_return_value): Use 'gdb_byte *' for
+	registers.
+
 2005-07-11  Mark Kettenis  <kettenis@gnu.org>
 
 	* bsd-kvm.c: Include <paths.h>.
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 5a59637404..1a38beca3a 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -1,7 +1,7 @@
 /* Dynamic architecture support for GDB, the GNU debugger.
 
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -43,7 +43,7 @@ void
 legacy_extract_return_value (struct type *type, struct regcache *regcache,
 			     gdb_byte *valbuf)
 {
-  char *registers = deprecated_grub_regcache_for_registers (regcache);
+  gdb_byte *registers = deprecated_grub_regcache_for_registers (regcache);
   gdb_byte *buf = valbuf;
   DEPRECATED_EXTRACT_RETURN_VALUE (type, registers, buf); /* OK */
 }
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index f306b948bb..a27ff68bd1 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1528,7 +1528,7 @@ print_object_command (char *args, int from_tty)
   struct value *object, *function, *description;
   CORE_ADDR string_addr, object_addr;
   int i = 0;
-  char c = -1;
+  gdb_byte c = 0;
 
   if (!args || !*args)
     error (
@@ -1560,7 +1560,7 @@ print_object_command (char *args, int from_tty)
     error (_("object returns null description"));
 
   read_memory (string_addr + i++, &c, 1);
-  if (c != '\0')
+  if (c != 0)
     do
       { /* Read and print characters up to EOS.  */
 	QUIT;