diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f9c814851e..5e1e43f45f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* common/cleanups.c (make_cleanup_dtor): Use typedef for dtor
+	type.
+
 2014-12-02  Doug Evans  <dje@google.com>
 
 	* symtab.c (symbol_init_cplus_specific): Delete.
diff --git a/gdb/common/cleanups.c b/gdb/common/cleanups.c
index 80271fd8ee..8678114ba9 100644
--- a/gdb/common/cleanups.c
+++ b/gdb/common/cleanups.c
@@ -124,7 +124,7 @@ make_cleanup (make_cleanup_ftype *function, void *arg)
 
 struct cleanup *
 make_cleanup_dtor (make_cleanup_ftype *function, void *arg,
-		   void (*dtor) (void *))
+		   make_cleanup_dtor_ftype *dtor)
 {
   return make_my_cleanup2 (&cleanup_chain,
 			   function, arg, dtor);