This commit was generated by cvs2svn to track changes on a CVS vendor

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

diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index 79c6b425f329cc0c796a1bb31251f4d760b95254..e820b28e51a00637333fa7accc73eb1ae2673a41 100644 (file)
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -38,12 +38,7 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "wait.h"
-#ifdef ANSI_PROTOTYPES
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+#include "gdb_wait.h"
 #include <signal.h>
 #include "gdb_string.h"
 #include <sys/types.h>
@@ -71,23 +66,12 @@ static serial_t st2000_desc;
 /* Send data to stdebug.  Works just like printf. */
 
 static void
-#ifdef ANSI_PROTOTYPES
 printf_stdebug (char *pattern,...)
-#else
-printf_stdebug (va_alist)
-     va_dcl
-#endif
 {
   va_list args;
   char buf[200];
 
-#ifdef ANSI_PROTOTYPES
   va_start (args, pattern);
-#else
-  char *pattern;
-  va_start (args);
-  pattern = va_arg (args, char *);
-#endif
 
   vsprintf (buf, pattern, args);
   va_end (args);
@@ -745,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);
@@ -780,7 +764,7 @@ connect_command (args, fromtty)
            }
        }
 
-      if (FD_ISSET (st2000_desc, &readfds))
+      if (FD_ISSET (DEPRECATED_SERIAL_FD (st2000_desc), &readfds))
        {
          while (1)
            {