Resolve conflicts for GDB 6.1. Add local patches.

ok deraadt@

1 files changed, 4 insertions, 2 deletions

diff --git a/gnu/usr.bin/binutils/gdb/vx-share/xdr_ptrace.h b/gnu/usr.bin/binutils/gdb/vx-share/xdr_ptrace.h
index 9b8a290e861..0ff57a98c33 100644
--- a/gnu/usr.bin/binutils/gdb/vx-share/xdr_ptrace.h
+++ b/gnu/usr.bin/binutils/gdb/vx-share/xdr_ptrace.h
@@ -1,6 +1,6 @@
 /* xdr_ptrace.h - xdr header for remote ptrace structures */
 
-/*  Copyright 1992 Free Software Foundation, Inc.
+/*  Copyright 1992, 1998 Free Software Foundation, Inc.
 
     This code was donated by Wind River Systems, Inc. */
 
@@ -57,9 +57,11 @@ typedef struct rptrace Rptrace;
 /*
  * structure returned by server on all remote ptrace calls
  */
+/* This used to have a field called errno, but that fails on hosts which
+   define errno to be a macro, so it was changed to errno_num.  */
 struct ptrace_return {
 	int status;
-	int errno;
+	int errno_num;
 	Ptrace_info	info;
 };
 typedef struct ptrace_return Ptrace_return;