Mon Nov 9 18:22:55 1998 Dave Brolley <brolley@cygnus.com>

[deliverable/binutils-gdb.git] / gdb / i386lynx-nat.c

diff --git a/gdb/i386lynx-nat.c b/gdb/i386lynx-nat.c
index 5d3fb211a6f2d1faefd03b5be80c0eeb295af701..27c605bf2baa378eb6aa992501906d213724304b 100644 (file)
--- a/gdb/i386lynx-nat.c
+++ b/gdb/i386lynx-nat.c
@@ -1,3 +1,4 @@
+<<<<<<< 2.6 is dead >>>>>>>
 /* Native-dependent code for Lynx running on i386's, for GDB.
    Copyright 1988, 1989, 1991, 1992, 1993
    Free Software Foundation, Inc.
@@ -187,10 +188,10 @@ store_inferior_registers (regno)
    of error; store status through argument pointer STATUS.  */
 
 int
-child_wait (status)
+child_wait (pid, status)
+     int pid;
      int *status;
 {
-  int pid;
   int save_errno;
   int thread;
 
@@ -211,7 +212,7 @@ child_wait (status)
        {
          if (save_errno == EINTR)
            continue;
-         fprintf (stderr, "Child process unexpectedly missing: %s.\n",
+         fprintf_unfiltered (gdb_stderr, "Child process unexpectedly missing: %s.\n",
                   safe_strerror (save_errno));
          *status = 42;         /* Claim it exited with signal 42 */
          return -1;