* auxv.c (procfs_xfer_auxv): Change type of the `object' argument

	to enum target_object.  Cleanup comments.
	* auxv.h: Include "target.h".  Cleanup comments to not mention
	NATIVE_XFER_AUXV anymore.

3 files changed, 17 insertions, 22 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5703caf5a6b..a804dadaa71 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+20009-06-07  Pedro  Alves  <pedro@codesourcery.com>
+
+	* auxv.c (procfs_xfer_auxv): Change type of the `object' argument
+	to enum target_object.  Cleanup comments.
+	* auxv.h: Include "target.h".  Cleanup comments to not mention
+	NATIVE_XFER_AUXV anymore.
+
 2009-06-07  Pedro Alves  <pedro@codesourcery.com>
 
 	* inferior.h (procfs_first_available): Move declaration to...
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 3a51ec58ce9..f8eb6ef0f14 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -33,16 +33,13 @@
 #include <fcntl.h>
 
 
-/* This function is called like a to_xfer_partial hook,
-   but must be called with TARGET_OBJECT_AUXV.
-   It handles access via /proc/PID/auxv, which is the common method.
-   This function is appropriate for doing:
-	   #define NATIVE_XFER_AUXV	procfs_xfer_auxv
-   for a native target that uses inftarg.c's child_xfer_partial hook.  */
+/* This function is called like a to_xfer_partial hook, but must be
+   called with TARGET_OBJECT_AUXV.  It handles access via
+   /proc/PID/auxv, which is a common method for native targets.  */
 
 LONGEST
 procfs_xfer_auxv (struct target_ops *ops,
-		  int /* enum target_object */ object,
+		  enum target_object object,
 		  const char *annex,
 		  gdb_byte *readbuf,
 		  const gdb_byte *writebuf,
diff --git a/gdb/auxv.h b/gdb/auxv.h
index 16618c8551d..71e656265d9 100644
--- a/gdb/auxv.h
+++ b/gdb/auxv.h
@@ -21,14 +21,9 @@
 #ifndef AUXV_H
 #define AUXV_H
 
-/* See "include/elf/common.h" for the definition of valid AT_* values.  */
-
-
-/* Avoid miscellaneous includes in this file, so that it can be
-   included by nm-*.h for the procfs_xfer_auxv decl if that is
-   used in NATIVE_XFER_AUXV.  */
-struct target_ops;		/* Forward declaration.  */
+#include "target.h"
 
+/* See "include/elf/common.h" for the definition of valid AT_* values.  */
 
 /* Read one auxv entry from *READPTR, not reading locations >= ENDPTR.
    Return 0 if *READPTR is already at the end of the buffer.
@@ -48,16 +43,12 @@ extern int target_auxv_search (struct target_ops *ops,
 /* Print the contents of the target's AUXV on the specified file. */
 extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
 
-
-/* This function is called like a to_xfer_partial hook,
-   but must be called with TARGET_OBJECT_AUXV.
-   It handles access via /proc/PID/auxv, which is the common method.
-   This function is appropriate for doing:
-	   #define NATIVE_XFER_AUXV	procfs_xfer_auxv
-   for a native target that uses inftarg.c's child_xfer_partial hook.  */
+/* This function is called like a to_xfer_partial hook, but must be
+   called with TARGET_OBJECT_AUXV.  It handles access via
+   /proc/PID/auxv, which is a common method for native targets.  */
 
 extern LONGEST procfs_xfer_auxv (struct target_ops *ops,
-				 int /* enum target_object */ object,
+				 enum target_object object,
 				 const char *annex,
 				 gdb_byte *readbuf,
 				 const gdb_byte *writebuf,