From 1cf6d1cdaaec39daaa6487b18b7cc42463dbe244 Mon Sep 17 00:00:00 2001
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Sun, 16 Jul 2006 09:57:02 +0000
Subject: [PATCH] Undefine _process_user_ before including
 <hurd/process_request.h>. (gnu_resume): Supply missing argument to error().
 (gnu_read_inferior): Add extra parenthesis around arithmetic expression to
 silence warnings from GCC. (gnu_write_inferior): Likewise. (gnu_xfer_memory):
 Changed type of MYADDR to `gdb_byte *'.

---
 gdb/ChangeLog | 10 ++++++++++
 gdb/gnu-nat.c | 11 +++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e12252e7c7..eaed9f43a9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-16  Alfred M. Szmidt  <ams@gnu.org>
+	
+	* gnu-nat.c: Undefine _process_user_ before including
+	<hurd/process_request.h>.
+	(gnu_resume): Supply missing argument to error().
+	(gnu_read_inferior): Add extra parenthesis around arithmetic
+	expression to silence warnings from GCC.
+	(gnu_write_inferior): Likewise.
+	(gnu_xfer_memory): Changed type of MYADDR to `gdb_byte *'.
+
 2006-07-16  Mark Kettenis  <kettenis@gnu.org>
 
 	* armnbsd-tdep.c (arm_netbsd_elf_init_abi): Use
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 968a9cf5f1..b626dfb49b 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -45,6 +45,9 @@
 #include <hurd/msg.h>
 #include <hurd/msg_request.h>
 #include <hurd/process.h>
+/* Defined in <hurd/process.h>, but we need forward declarations from
+   <hurd/process_request.h> as well.  */
+#undef _process_user_
 #include <hurd/process_request.h>
 #include <hurd/signal.h>
 #include <hurd/sigpreempt.h>
@@ -1978,7 +1981,7 @@ gnu_resume (ptid_t tid, int step, enum target_signal sig)
     {
       struct proc *thread = inf_tid_to_thread (inf, PIDGET (tid));
       if (!thread)
-	error (_("Can't run single thread id %d: no such thread!"));
+	error (_("Can't run single thread id %d: no such thread!"), inf->pid);
       inf_debug (inf, "running one thread: %d/%d", inf->pid, thread->tid);
       inf_set_threads_resume_sc (inf, thread, 0);
     }
@@ -2257,7 +2260,7 @@ gnu_read_inferior (task_t task, CORE_ADDR addr, char *myaddr, int length)
   if (err)
     return 0;
 
-  err = hurd_safe_copyin (myaddr, (void *) addr - low_address + copied, length);
+  err = hurd_safe_copyin (myaddr, (void *) (addr - low_address + copied), length);
   if (err)
     {
       warning (_("Read from inferior faulted: %s"), safe_strerror (err));
@@ -2312,7 +2315,7 @@ gnu_write_inferior (task_t task, CORE_ADDR addr, char *myaddr, int length)
 
   deallocate++;
 
-  err = hurd_safe_copyout ((void *) addr - low_address + copied,
+  err = hurd_safe_copyout ((void *) (addr - low_address + copied),
 			   myaddr, length);
   CHK_GOTO_OUT ("Write to inferior faulted", err);
 
@@ -2445,7 +2448,7 @@ out:
 /* Return 0 on failure, number of bytes handled otherwise.  TARGET
    is ignored. */
 static int
-gnu_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+gnu_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
 		 struct mem_attrib *attrib,
 		 struct target_ops *target)
 {
-- 
2.11.0