* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7bb0743b026639e204315a410f58e522f512206e..5863801029f3cf0ad1f4b19bd51af4571988947d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-16  Mark Kettenis  <kettenis@gnu.org>
+
+       * 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  <kettenis@gnu.org>
 
        * config/i386/nm-linux64.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE):

diff --git a/gdb/inferior.h b/gdb/inferior.h
index 6e6ee90ecbfaeab0ec9eab836b93dd72c72ad2f8..fee4bca63991d79d762f19a265602e322ed4661b 100644 (file)
--- 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 7283b32e6c2e23648be9344ddd8d5d31d6dd16ba..f95bf139dcd127d7821d3ba2fb22167cc00b92ab 100644 (file)
--- 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;