Unbreak 'target async'.

        * serial.c (serial_async): Set the
        handler function before enabling async
        mode.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 05896bef9a0d57f46ab50714b9a6eedfc8124536..1af57618e4b94540cb4280508f10754bc76454a5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-23  Vladimir Prus  <vladimir@codesourcery.com>
+
+       Unbreak 'target async'.
+        * serial.c (serial_async): Set the
+        handler function before enabling async
+        mode.
+
 2008-02-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * solib-svr4.c (enable_break): Convert r_brk to a code address.

diff --git a/gdb/serial.c b/gdb/serial.c
index 7bdf170fcdd22a39930487ce8056cd38a029116a..1fb7f31a553ebe4abee17427dab75214a726051b 100644 (file)
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -515,12 +515,12 @@ serial_async (struct serial *scb,
              serial_event_ftype *handler,
              void *context)
 {
-  /* Only change mode if there is a need. */
-  if ((scb->async_handler == NULL)
-      != (handler == NULL))
-    scb->ops->async (scb, handler != NULL);
+  int changed = ((scb->async_handler == NULL) != (handler == NULL));
   scb->async_handler = handler;
   scb->async_context = context;
+  /* Only change mode if there is a need.  */
+  if (changed)
+    scb->ops->async (scb, handler != NULL);
 }
 
 int