[git commit master] sh/user.h: clean up conflicts from kernel user.h

[Mike Frysinger]

commit: http://git.uclibc.org/uClibc/commit/?id=2b4af5d5bf440711e1b5b8329cb74631e6d65c04
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

This patch makes sufficient modifications to the SH sys/user.h to be
able to build and run gdbserver with Linux kernel 2.6.30.

The problem is that both the kernel and library headers define the same
symbols, thus making it impossible in include both headers. The patch
undefines the kernel symbols in favour of the library symbols.

Signed-off-by: Andrew Stubbs <ams at codesourcery.com>
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
 libc/sysdeps/linux/sh/sys/user.h |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/libc/sysdeps/linux/sh/sys/user.h b/libc/sysdeps/linux/sh/sys/user.h
index b1adc13..91b0091 100644
--- a/libc/sysdeps/linux/sh/sys/user.h
+++ b/libc/sysdeps/linux/sh/sys/user.h
@@ -22,6 +22,17 @@
 #include <unistd.h>
 #include <asm/ptrace.h>
 
+/* asm/ptrace.h polutes the namespace.  */
+#undef PTRACE_GETREGS
+#undef PTRACE_SETREGS
+#undef PTRACE_GETFPREGS
+#undef PTRACE_SETFPREGS
+#undef PTRACE_GETFDPIC
+#undef PTRACE_GETFDPIC_EXEC
+#undef PTRACE_GETFDPIC_INTERP
+#undef PTRACE_GETDSPREGS
+#undef PTRACE_SETDSPREGS
+
 /*
  * Core file format: The core file is written in such a way that gdb
  * can understand it and provide useful information to the user (under
-- 
1.6.3.3