[ros-diffs] [sginsberg] 42550: - Fix intrinsics for MSVC -- just include intrin.h instead of duplicating the definitions.

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Sun Aug  9 11:58:07 2009
New Revision: 42550

URL: http://svn.reactos.org/svn/reactos?rev=42550&view=rev
Log:
- Fix intrinsics for MSVC -- just include intrin.h instead of duplicating the definitions.

Modified:
    trunk/reactos/include/ddk/wdm.h
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/include/psdk/winnt.h

Modified: trunk/reactos/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=42550&r1=42549&r2=42550&view=diff
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Aug  9 11:58:07 2009
@@ -13,9 +13,7 @@
 #include <guiddef.h>
 #endif /* GUID_DEFINED */
 
-#ifdef __GNUC__
 #include "intrin.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/reactos/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=42550&r1=42549&r2=42550&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Aug  9 11:58:07 2009
@@ -31,27 +31,7 @@
 #include <ntdef.h>
 #include <ntstatus.h>
 
-#ifdef __GNUC__
 #include "intrin.h"
-#endif
-
-#ifdef _MSC_VER
-//
-// FIXME: MSVC Intrinsics
-//
-unsigned char __readfsbyte(const unsigned long Offset);
-#pragma intrinsic(__readfsbyte)
-long _InterlockedExchange(volatile long * const Target, const long Value);
-#pragma intrinsic(_InterlockedExchange)
-long _InterlockedExchangeAdd(volatile long * const Addend, const long Value);
-#pragma intrinsic(_InterlockedExchangeAdd)
-long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand);
-#pragma intrinsic(_InterlockedCompareExchange)
-long _InterlockedDecrement(volatile long * const lpAddend);
-#pragma intrinsic(_InterlockedDecrement)
-long _InterlockedIncrement(volatile long * const lpAddend);
-#pragma intrinsic(_InterlockedIncrement)
-#endif
 
 #if !defined(_NTHAL_)
 #define NTHALAPI DECLSPEC_IMPORT

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=42550&r1=42549&r2=42550&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Aug  9 11:58:07 2009
@@ -232,9 +232,7 @@
 #define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1]
 
 
-#ifdef __GNUC__
 #include "intrin.h"
-#endif
 
 #define NTAPI __stdcall
 #include <basetsd.h>
@@ -4893,9 +4891,6 @@
 
 #if (_MSC_FULL_VER >= 13012035)
 
-unsigned long __readfsdword(const unsigned long Offset);
-#pragma intrinsic(__readfsdword)
-
 __inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); }
 __inline struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)__readfsdword(0x18); }