diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0bb06aea030..66f6dd6439d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-29  Pedro Alves  <palves@redhat.com>
+
+	* common/common-exceptions.c (exception_none): Add cast.
+
 2015-10-29  Pedro Alves  <palves@redhat.com>
 
 	* compile/compile-c-types.c (struct type_map_instance)
diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c
index 8ee96aba528..ce476a257b1 100644
--- a/gdb/common/common-exceptions.c
+++ b/gdb/common/common-exceptions.c
@@ -20,7 +20,7 @@
 #include "common-defs.h"
 #include "common-exceptions.h"
 
-const struct gdb_exception exception_none = { 0, GDB_NO_ERROR, NULL };
+const struct gdb_exception exception_none = { (enum return_reason) 0, GDB_NO_ERROR, NULL };
 
 #ifndef __cplusplus