* inflow.c (O_NOCTTY): Define to zero if not already defined.

[deliverable/binutils-gdb.git] / gdb / infttrace.c

diff --git a/gdb/infttrace.c b/gdb/infttrace.c
index e0238e8bc55d8b9c34d1ded9252288998a8905aa..d62c4bd6803cd353af779be322dc1f2026b7c7e6 100644 (file)
--- a/gdb/infttrace.c
+++ b/gdb/infttrace.c
@@ -1,7 +1,7 @@
 /* Low level Unix child interface to ttrace, for GDB when running under HP-UX.
-   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
-   1999, 2000, 2001, 2003
-   Free Software Foundation, Inc.
+
+   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+   1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,6 +28,7 @@
 #include "gdb_wait.h"
 #include "command.h"
 #include "gdbthread.h"
+#include "infttrace.h"
 
 /* We need pstat functionality so that we can get the exec file
    for a process we attach to.
@@ -118,7 +119,7 @@
 #endif
 
 #include "gdbcore.h"
-#ifndef        NO_SYS_FILE
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
 
@@ -4559,8 +4560,6 @@ child_resume (ptid_t ptid, int step, enum target_signal signal)
 }
 #endif /* CHILD_RESUME */
 \f
-
-#ifdef ATTACH_DETACH
 /*
  * Like it says.
  *
@@ -4732,10 +4731,8 @@ update_thread_state_after_attach (int pid, attach_continue_t kind_of_go)
 
   attach_flag = 1;
 }
-#endif /* ATTACH_DETACH */
 \f
 
-#ifdef ATTACH_DETACH
 /* Start debugging the process whose number is PID.
  * (A _real_ pid).
  */
@@ -4802,7 +4799,6 @@ detach (int signal)
 
   /* Process-state? */
 }
-#endif /* ATTACH_DETACH */
 \f
 
 /* Default the type of the ttrace transfer to int.  */
@@ -4836,18 +4832,18 @@ child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
                   struct mem_attrib *attrib,
                   struct target_ops *target)
 {
-  register int i;
+  int i;
   /* Round starting address down to longword boundary.  */
-  register CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (TTRACE_XFER_TYPE);
+  CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (TTRACE_XFER_TYPE);
   /* Round ending address up; get number of longwords that makes.  */
-  register int count
+  int count
   = (((memaddr + len) - addr) + sizeof (TTRACE_XFER_TYPE) - 1)
   / sizeof (TTRACE_XFER_TYPE);
   /* Allocate buffer of that many longwords.  */
   /* FIXME (alloca): This code, cloned from infptrace.c, is unsafe
      because it uses alloca to allocate a buffer of arbitrary size.
      For very large xfers, this could crash GDB's stack.  */
-  register TTRACE_XFER_TYPE *buffer
+  TTRACE_XFER_TYPE *buffer
     = (TTRACE_XFER_TYPE *) alloca (count * sizeof (TTRACE_XFER_TYPE));
 
   if (write)