From f1c85411a8edd71366d723bc297d49a52112cb74 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 15 Jun 2015 18:47:39 -0700
Subject: [PATCH] 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
(cherry picked from commit 0577733c2e15a4745d5c75f59e5f56dd179a4aa7)
---
 libc/include/sys/ucontext.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/include/sys/ucontext.h b/libc/include/sys/ucontext.h
index 8bd8c3bf1..399458ebe 100644
--- 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;