diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c265d247f49..f2e672c6fca 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-19  Pedro Alves  <palves@redhat.com>
+
+	* cp-valprint.c (cp_print_class_member): Change type of 'fieldno'
+	local to int.
+
 2013-04-19  Pedro Alves  <palves@redhat.com>
 
 	* ada-lang.c (print_it_exception): Add cast to gdb_byte *.
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 9a8b4d30088..0871848ec77 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -768,7 +768,7 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type,
      print it.  */
   struct type *domain = TYPE_DOMAIN_TYPE (type);
   LONGEST val;
-  unsigned int fieldno;
+  int fieldno;
 
   val = extract_signed_integer (valaddr,
 				TYPE_LENGTH (type),