From d4a96aae267665f509fc5331ae9d0ae76fe8704b Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 11 Apr 2015 08:28:20 +0000
Subject: [PATCH] [PSDK/XDK/CRT] - Fix ARM build of libwine. Patch by Yuntian
 Zhang. CORE-8672 #resolve - Don't include non-existant ARM intrinsic headers

svn path=/trunk/; revision=67149
---
 reactos/include/crt/intrin.h    | 4 ++--
 reactos/include/psdk/winnt.h    | 4 ++++
 reactos/include/xdk/winnt_old.h | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/reactos/include/crt/intrin.h b/reactos/include/crt/intrin.h
index 8d4c3a5f643..038d488be7a 100644
--- a/reactos/include/crt/intrin.h
+++ b/reactos/include/crt/intrin.h
@@ -16,8 +16,8 @@
 #endif /* _M_IX86 */
 
 #if defined(_M_ARM)
-#include <arm_neon.h>
-#include <armintr.h>
+//#include <arm_neon.h>
+//#include <armintr.h>
 #endif /* _M_ARM */
 
 #if defined(__cplusplus)
diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 32cee88b378..051ccdb505b 100644
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -5934,7 +5934,11 @@ FORCEINLINE struct _TEB * NtCurrentTeb(void)
 }
 FORCEINLINE PVOID GetCurrentFiber(VOID)
 {
+  #ifdef NONAMELESSUNION
+    return ((PNT_TIB )(ULONG_PTR)_MoveFromCoprocessor(CP15_TPIDRURW))->DUMMYUNIONNAME.FiberData;
+  #else
     return ((PNT_TIB )(ULONG_PTR)_MoveFromCoprocessor(CP15_TPIDRURW))->FiberData;
+  #endif
 }
 #elif defined(_M_PPC)
 FORCEINLINE unsigned long _read_teb_dword(const unsigned long Offset)
diff --git a/reactos/include/xdk/winnt_old.h b/reactos/include/xdk/winnt_old.h
index 6dfd2d95720..048757c210d 100644
--- a/reactos/include/xdk/winnt_old.h
+++ b/reactos/include/xdk/winnt_old.h
@@ -4577,7 +4577,11 @@ FORCEINLINE struct _TEB * NtCurrentTeb(void)
 }
 FORCEINLINE PVOID GetCurrentFiber(VOID)
 {
+  #ifdef NONAMELESSUNION
+    return ((PNT_TIB )(ULONG_PTR)_MoveFromCoprocessor(CP15_TPIDRURW))->DUMMYUNIONNAME.FiberData;
+  #else
     return ((PNT_TIB )(ULONG_PTR)_MoveFromCoprocessor(CP15_TPIDRURW))->FiberData;
+  #endif
 }
 #elif defined(_M_PPC)
 FORCEINLINE unsigned long _read_teb_dword(const unsigned long Offset)