FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undefine _process_user_ before including

Browse source 
<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 *'.
This commit is contained in:
Alfred M. Szmidt 2006-07-16 09:57:02 +00:00
parent 7f37c01082
commit 96ffcb620f
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gdb/ChangeLog
View file

@ -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> 2006-07-16 Mark Kettenis <kettenis@gnu.org>
* armnbsd-tdep.c (arm_netbsd_elf_init_abi): Use * armnbsd-tdep.c (arm_netbsd_elf_init_abi): Use

11
gdb/gnu-nat.c
View file

@ -45,6 +45,9 @@
#include <hurd/msg.h> #include <hurd/msg.h>
#include <hurd/msg_request.h> #include <hurd/msg_request.h>
#include <hurd/process.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/process_request.h>
#include <hurd/signal.h> #include <hurd/signal.h>
#include <hurd/sigpreempt.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)); struct proc *thread = inf_tid_to_thread (inf, PIDGET (tid));
if (!thread) 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_debug (inf, "running one thread: %d/%d", inf->pid, thread->tid);
inf_set_threads_resume_sc (inf, thread, 0); 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) if (err)
return 0; 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) if (err)
{ {
warning (_("Read from inferior faulted: %s"), safe_strerror (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++; deallocate++;
err = hurd_safe_copyout ((void *) addr - low_address + copied, err = hurd_safe_copyout ((void *) (addr - low_address + copied),
myaddr, length); myaddr, length);
CHK_GOTO_OUT ("Write to inferior faulted", err); CHK_GOTO_OUT ("Write to inferior faulted", err);
@ -2445,7 +2448,7 @@ out:
/* Return 0 on failure, number of bytes handled otherwise. TARGET /* Return 0 on failure, number of bytes handled otherwise. TARGET
is ignored. */ is ignored. */
static int 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 mem_attrib *attrib,
struct target_ops *target) struct target_ops *target)
{ {