[ros-diffs] [tkreuzer] 67149: [PSDK/XDK/CRT] - Fix ARM build of libwine. Patch by Yuntian Zhang. CORE-8672 #resolve - Don't include non-existant ARM intrinsic headers

Author: tkreuzer
Date: Sat Apr 11 08:28:20 2015
New Revision: 67149

URL: http://svn.reactos.org/svn/reactos?rev=67149&view=rev
Log:
[PSDK/XDK/CRT]
- Fix ARM build of libwine. Patch by Yuntian Zhang. CORE-8672 #resolve
- Don't include non-existant ARM intrinsic headers

Modified:
    trunk/reactos/include/crt/intrin.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/xdk/winnt_old.h

Modified: trunk/reactos/include/crt/intrin.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=67...
==============================================================================
--- trunk/reactos/include/crt/intrin.h	[iso-8859-1] (original)
+++ trunk/reactos/include/crt/intrin.h	[iso-8859-1] Sat Apr 11 08:28:20 2015
@@ -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)

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=67...
==============================================================================
--- trunk/reactos/include/psdk/winnt.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h	[iso-8859-1] Sat Apr 11 08:28:20 2015
@@ -5934,7 +5934,11 @@
 }
 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)

Modified: trunk/reactos/include/xdk/winnt_old.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?rev...
==============================================================================
--- trunk/reactos/include/xdk/winnt_old.h	[iso-8859-1] (original)
+++ trunk/reactos/include/xdk/winnt_old.h	[iso-8859-1] Sat Apr 11 08:28:20 2015
@@ -4577,7 +4577,11 @@
 }
 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)