PR build/7196:

	* remote.c (putpkt_for_catch_errors): New function.
	(remote_kill): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 393cdf0359c424d79b5bb610b64e1afb244b053b..1a5d5f771eaf11926326de9ba43892ba7eb60411 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-18  Tom Tromey  <tromey@redhat.com>
+
+       PR build/7196:
+       * remote.c (putpkt_for_catch_errors): New function.
+       (remote_kill): Use it.
+
 2011-11-18  Yao Qi  <yao@codesourcery.com>
 
        * breakpoint.c (create_breakpoint): Produce query message according to

diff --git a/gdb/remote.c b/gdb/remote.c
index 6e9e242eeb8b2fdce1f895b9523ce8f493690301..6ac5fc04490d44707ad1fde05f798c7e49833d65 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -7369,12 +7369,20 @@ getpkt_or_notif_sane (char **buf, long *sizeof_buf, int forever)
 }
 
 \f
+/* A helper function that just calls putpkt; for type correctness.  */
+
+static int
+putpkt_for_catch_errors (void *arg)
+{
+  return putpkt (arg);
+}
+
 static void
 remote_kill (struct target_ops *ops)
 {
   /* Use catch_errors so the user can quit from gdb even when we
      aren't on speaking terms with the remote system.  */
-  catch_errors ((catch_errors_ftype *) putpkt, "k", "", RETURN_MASK_ERROR);
+  catch_errors (putpkt_for_catch_errors, "k", "", RETURN_MASK_ERROR);
 
   /* Don't wait for it to die.  I'm not really sure it matters whether
      we do or not.  For the existing stubs, kill is a noop.  */