* inf-ptrace.c: Don't include "regcache.h" and "gdbcmd.h".

Reorder includes a bit.  Fix comment.
* Makefile.in (inf-ptrace.o): Update dependencies.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3a5ac4537f76568e76731abd2285c1e690b2c811..1a525bc96cb5e997bea64e251942091d73ded96b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-21  Mark Kettenis  <kettenis@gnu.org>
+
+       * inf-ptrace.c: Don't include "regcache.h" and "gdbcmd.h".
+       Reorder includes a bit.  Fix comment.
+       * Makefile.in (inf-ptrace.o): Update dependencies.
+
 2004-11-21  Andreas Schwab  <schwab@suse.de>
 
        * m68klinux-tdep.c: Include "glibc-tdep.h" and "solib-svr4.h".

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7593097c41ebdc4cfa6f7fc357c21517dd58fa48..5173f06bd47ac874e9d8772c6802cd39e9fb68d8 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2082,9 +2082,9 @@ inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(target_h) $(event_loop_h) \
 inflow.o: inflow.c $(defs_h) $(frame_h) $(inferior_h) $(command_h) \
        $(serial_h) $(terminal_h) $(target_h) $(gdbthread_h) $(gdb_string_h) \
        $(inflow_h)
-inf-ptrace.o: inf-ptrace.c $(defs_h) $(observer_h) $(gdb_ptrace_h) \
-       $(inflow_h) $(inferior_h) $(regcache_h) $(command_h) $(gdbcore_h) \
-       $(inf_child_h) $(gdbcmd_h) $(gdb_string_h) $(gdb_wait_h)
+inf-ptrace.o: inf-ptrace.c $(defs_h) $(command_h) $(inferior_h) $(inflow_h) \
+       $(gdbcore_h) $(observer_h) $(gdb_string_h) $(gdb_ptrace_h) \
+       $(gdb_wait_h) $(inf_child_h)
 infptrace.o: infptrace.c $(defs_h) $(command_h) $(frame_h) $(gdbcore_h) \
        $(inferior_h) $(regcache_h) $(target_h) $(gdb_assert_h) \
        $(gdb_wait_h) $(gdb_string_h) $(gdb_dirent_h) $(gdb_ptrace_h)

diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 2d5f09d342fa642774fd7703b9ab412b795600f0..c2f5ead9874b463ef8ce093a6088a5db3a470cbd 100644 (file)
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -1,4 +1,4 @@
-/* Low level Unix child interface to ptrace, for GDB when running under Unix.
+/* Low-level child interface to ptrace.
 
    Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
    1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
@@ -21,21 +21,20 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "observer.h"
-#include "gdb_ptrace.h"
-#include "inflow.h"
-#include "inferior.h"
-#include "regcache.h"
 #include "command.h"
+#include "inferior.h"
+#include "inflow.h"
 #include "gdbcore.h"
-#include "inf-child.h"
-#include "gdbcmd.h"
-#include "gdb_string.h"
+#include "observer.h"
 
+#include "gdb_string.h"
+#include "gdb_ptrace.h"
 #include "gdb_wait.h"
 #include <signal.h>
 
-/* HACK: Save the ptrace ops returned by ptrace_target.  */
+#include "inf-child.h"
+
+/* HACK: Save the ptrace ops returned by inf_ptrace_target.  */
 static struct target_ops *ptrace_ops_hack;
 
 static void