diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 643c49c207..e8efc3c658 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01  Tom Tromey  <tromey@redhat.com>
+
+	* value.h (val_print): Return void.
+	* valprint.c (val_print): Return void.
+
 2012-03-01  Tom Tromey  <tromey@redhat.com>
 
 	* value.h (common_val_print): Return void.
diff --git a/gdb/valprint.c b/gdb/valprint.c
index a543552916..0bdde01040 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -330,12 +330,9 @@ val_print_invalid_address (struct ui_file *stream)
 
    RECURSE indicates the amount of indentation to supply before
    continuation lines; this amount is roughly twice the value of
-   RECURSE.
+   RECURSE.  */
 
-   If the data is printed as a string, returns the number of string
-   characters printed.  */
-
-int
+void
 val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	   CORE_ADDR address, struct ui_file *stream, int recurse,
 	   const struct value *val,
@@ -361,11 +358,11 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
     {
       fprintf_filtered (stream, _("<incomplete type>"));
       gdb_flush (stream);
-      return (0);
+      return;
     }
 
   if (!valprint_check_validity (stream, real_type, embedded_offset, val))
-    return 0;
+    return;
 
   if (!options->raw)
     {
@@ -373,7 +370,7 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 				      address, stream, recurse,
 				      val, options, language);
       if (ret)
-	return ret;
+	return;
     }
 
   /* Handle summary mode.  If the value is a scalar, print it;
@@ -381,7 +378,7 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
   if (options->summary && !scalar_type_p (type))
     {
       fprintf_filtered (stream, "...");
-      return 0;
+      return;
     }
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
@@ -392,8 +389,6 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
     }
   if (except.reason < 0)
     fprintf_filtered (stream, _("<error reading variable>"));
-
-  return ret;
 }
 
 /* Check whether the value VAL is printable.  Return 1 if it is;
diff --git a/gdb/value.h b/gdb/value.h
index bb6f1f61a6..f0fdb4cac3 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -817,12 +817,12 @@ extern void value_print_array_elements (struct value *val,
 
 extern struct value *value_release_to_mark (struct value *mark);
 
-extern int val_print (struct type *type, const gdb_byte *valaddr,
-		      int embedded_offset, CORE_ADDR address,
-		      struct ui_file *stream, int recurse,
-		      const struct value *val,
-		      const struct value_print_options *options,
-		      const struct language_defn *language);
+extern void val_print (struct type *type, const gdb_byte *valaddr,
+		       int embedded_offset, CORE_ADDR address,
+		       struct ui_file *stream, int recurse,
+		       const struct value *val,
+		       const struct value_print_options *options,
+		       const struct language_defn *language);
 
 extern void common_val_print (struct value *val,
 			      struct ui_file *stream, int recurse,