2 files changed, 4 insertions, 2 deletions
diff --git a/gdb/vx-share/xdr_ptrace.c b/gdb/vx-share/xdr_ptrace.c
index 6c9c8a2..fff4324 100644
--- a/gdb/vx-share/xdr_ptrace.c
+++ b/gdb/vx-share/xdr_ptrace.c
@@ -109,7 +109,7 @@ bool_t xdr_ptrace_return(xdrs, objp)
     {
     if (! xdr_int(xdrs, &objp->status)) 
 	return(FALSE);
-    if (! xdr_int(xdrs, &objp->errno)) 
+    if (! xdr_int(xdrs, &objp->errno_num)) 
 	return(FALSE);
     if (! xdr_ptrace_info(xdrs, &objp->info)) 
 	return(FALSE);
diff --git a/gdb/vx-share/xdr_ptrace.h b/gdb/vx-share/xdr_ptrace.h
index 9b8a290..9b4eb2b 100644
--- a/gdb/vx-share/xdr_ptrace.h
+++ b/gdb/vx-share/xdr_ptrace.h
@@ -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;