revert 1.9. Not approved.

[deliverable/binutils-gdb.git] / gdb / remote-st.c

diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index 3400903503fa9f7f3ddf170075db11e5abae2925..e820b28e51a00637333fa7accc73eb1ae2673a41 100644 (file)
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -38,7 +38,7 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "wait.h"
+#include "gdb_wait.h"
 #include <signal.h>
 #include "gdb_string.h"
 #include <sys/types.h>
@@ -729,7 +729,7 @@ connect_command (args, fromtty)
       do
        {
          FD_SET (0, &readfds);
-         FD_SET (st2000_desc, &readfds);
+         FD_SET (DEPRECATED_SERIAL_FD (st2000_desc), &readfds);
          numfds = select (sizeof (readfds) * 8, &readfds, 0, 0, 0);
        }
       while (numfds == 0);
@@ -764,7 +764,7 @@ connect_command (args, fromtty)
            }
        }
 
-      if (FD_ISSET (st2000_desc, &readfds))
+      if (FD_ISSET (DEPRECATED_SERIAL_FD (st2000_desc), &readfds))
        {
          while (1)
            {