From f8707cace9206398d6f02338fc40ba3aefb221a6 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 16 Aug 2004 15:27:54 +0000 Subject: [PATCH] * inferior.h (PTRACE_ARG3_TYPE): Define as PTRACE_TYPE_ARG3 instead of `int' if not already defined. (call_ptrace): Revert change that replaced PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3. * infptrace.c (call_ptrace): Revert change that replaced PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3. --- gdb/ChangeLog | 9 +++++++++ gdb/inferior.h | 4 ++-- gdb/infptrace.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7bb0743b026..5863801029f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2004-08-16 Mark Kettenis + + * inferior.h (PTRACE_ARG3_TYPE): Define as PTRACE_TYPE_ARG3 + instead of `int' if not already defined. + (call_ptrace): Revert change that replaced PTRACE_ARG3_TYPE with + PTRACE_TYPE_ARG3. + * infptrace.c (call_ptrace): Revert change that replaced + PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3. + 2004-08-15 Mark Kettenis * config/i386/nm-linux64.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): diff --git a/gdb/inferior.h b/gdb/inferior.h index 6e6ee90ecbf..fee4bca6399 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -237,10 +237,10 @@ int ptrace_wait (ptid_t, int *); extern void child_resume (ptid_t, int, enum target_signal); #ifndef PTRACE_ARG3_TYPE -#define PTRACE_ARG3_TYPE int /* Correct definition for most systems. */ +#define PTRACE_ARG3_TYPE PTRACE_TYPE_ARG3 #endif -extern int call_ptrace (int, int, PTRACE_TYPE_ARG3, int); +extern int call_ptrace (int, int, PTRACE_ARG3_TYPE, int); extern void pre_fork_inferior (void); diff --git a/gdb/infptrace.c b/gdb/infptrace.c index 7283b32e6c2..f95bf139dcd 100644 --- a/gdb/infptrace.c +++ b/gdb/infptrace.c @@ -107,7 +107,7 @@ void _initialize_infptrace (void); It exists so that all calls to ptrace are isolated in this machine-dependent file. */ int -call_ptrace (int request, int pid, PTRACE_TYPE_ARG3 addr, int data) +call_ptrace (int request, int pid, PTRACE_ARG3_TYPE addr, int data) { int pt_status = 0; -- 2.30.2