commit df11f340cac2e7aa5ef69c3180d0f4089f46c96b
author Elliott Hughes <enh@google.com> Tue Jun 16 01:50:24 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 16 01:50:25 2015 +0000
tree fcc6c2361563cadc559d4bce341c75d7d937562e
parent 27f5c37b12042dea3d9521b7b0287820c1e669f0
parent 0577733c2e15a4745d5c75f59e5f56dd179a4aa7

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

libc/include/sys/ucontext.h

diff --git a/libc/include/sys/ucontext.h b/libc/include/sys/ucontext.h
index 8bd8c3b..399458e 100644
--- a/libc/include/sys/ucontext.h
+++ b/libc/include/sys/ucontext.h
@@ -83,12 +83,12 @@
 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;