Avoid name collision with user_fpsimd_state in <asm/ptrace.h>.

We don't want to use <asm/ptrace.h> because (a) it'll drag in a bunch of
namespace pollution and (b) the registers should be "long double" for
userspace, not the kernel's uint128s. So just use a slightly different
name for our struct (which matches the traditional names for these structs
anyway).

Bug: http://b/21695943
Bug: https://code.google.com/p/android/issues/detail?id=86712
Change-Id: I8812ca98cfe6b649dbd31f7d6aea41928ba2acbd

diff --git a/libc/include/sys/ucontext.h b/libc/include/sys/ucontext.h
index 8bd8c3b..399458e 100644 (file)
--- a/libc/include/sys/ucontext.h
+++ b/libc/include/sys/ucontext.h
@@ -83,12 +83,12 @@ typedef struct ucontext {
 typedef unsigned long greg_t;
 typedef greg_t gregset_t[NGREG];
 
-struct user_fpsimd_state {
+struct user_fpsimd_struct {
   long double vregs[32];
   uint32_t fpsr;
   uint32_t fpcr;
 };
-typedef struct user_fpsimd_state fpregset_t;
+typedef struct user_fpsimd_struct fpregset_t;
 
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;