diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d11e2263f5..2e0109e36b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-20  Tom Tromey  <tromey@redhat.com>
+
+	PR python/15816:
+	* exceptions.h (return_mask): Now an enum.
+	(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL): Now
+	enum constants.
+
 2013-08-20  Tom Tromey  <tromey@redhat.com>
 
 	* cp-namespace.c (cp_lookup_symbol_imports_or_template): Use
diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index bf41860844..129d29a62a 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -38,10 +38,13 @@ enum return_reason
   };
 
 #define RETURN_MASK(reason)	(1 << (int)(-reason))
-#define RETURN_MASK_QUIT	RETURN_MASK (RETURN_QUIT)
-#define RETURN_MASK_ERROR	RETURN_MASK (RETURN_ERROR)
-#define RETURN_MASK_ALL		(RETURN_MASK_QUIT | RETURN_MASK_ERROR)
-typedef int return_mask;
+
+typedef enum
+{
+  RETURN_MASK_QUIT = RETURN_MASK (RETURN_QUIT),
+  RETURN_MASK_ERROR = RETURN_MASK (RETURN_ERROR),
+  RETURN_MASK_ALL = (RETURN_MASK_QUIT | RETURN_MASK_ERROR)
+} return_mask;
 
 /* Describe all exceptions.  */