From 2c4a536d5dea77889ddeeddd194758f34ce9dd8a Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sun, 21 Nov 2004 13:51:53 +0000
Subject: [PATCH] * inf-ptrace.c: Don't include "regcache.h" and "gdbcmd.h".
 Reorder includes a bit.  Fix comment. * Makefile.in (inf-ptrace.o): Update
 dependencies.

---
 gdb/ChangeLog    |  6 ++++++
 gdb/Makefile.in  |  6 +++---
 gdb/inf-ptrace.c | 19 +++++++++----------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3a5ac4537f7..1a525bc96cb 100644
--- 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 7593097c41e..5173f06bd47 100644
--- 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 2d5f09d342f..c2f5ead9874 100644
--- 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
-- 
2.30.2