Replace ../include/wait.h with gdb_wait.h.

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

diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index b14b460d7621484f306c20a7e805b8df39c11d5a..dd821154e42718eb4c642e155c1a857115c4dc73 100644 (file)
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -40,7 +40,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>
@@ -512,12 +512,8 @@ rombug_wait (pid, status)
     {
       if (obj_sec->objfile != symfile_objfile)
        new_symfile_objfile (obj_sec->objfile, 1, 0);
-      offs = ((struct section_offsets *)
-             alloca (sizeof (struct section_offsets)
-              + (symfile_objfile->num_sections * sizeof (offs->offsets))));
-      memcpy (offs, symfile_objfile->section_offsets,
-             (sizeof (struct section_offsets) +
-                (symfile_objfile->num_sections * sizeof (offs->offsets))));
+      offs = (struct section_offsets *) alloca (SIZEOF_SECTION_OFFSETS);
+      memcpy (offs, symfile_objfile->section_offsets, SIZEOF_SECTION_OFFSETS);
       ANOFFSET (offs, SECT_OFF_DATA) = addr;
       ANOFFSET (offs, SECT_OFF_BSS) = addr;
 
@@ -1078,7 +1074,7 @@ connect_command (args, fromtty)
       do
        {
          FD_SET (0, &readfds);
-         FD_SET (monitor_desc, &readfds);
+         FD_SET (DEPRECATED_SERIAL_FD (monitor_desc), &readfds);
          numfds = select (sizeof (readfds) * 8, &readfds, 0, 0, 0);
        }
       while (numfds == 0);
@@ -1113,7 +1109,7 @@ connect_command (args, fromtty)
            }
        }
 
-      if (FD_ISSET (monitor_desc, &readfds))
+      if (FD_ISSET (DEPRECATED_SERIAL_FD (monitor_desc), &readfds))
        {
          while (1)
            {