[ros-diffs] [cwittich] 36153: fix redefinitions add MemoryBarrier for MSVC

[cwittich at svn.reactos.org]

Author: cwittich
Date: Fri Sep 12 03:07:52 2008
New Revision: 36153

URL: http://svn.reactos.org/svn/reactos?rev=36153&view=rev
Log:
fix redefinitions
add MemoryBarrier for MSVC

Modified:
    trunk/reactos/include/psdk/windef.h
    trunk/reactos/include/psdk/winnt.h

Modified: trunk/reactos/include/psdk/windef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=36153&r1=36152&r2=36153&view=diff
==============================================================================
--- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Fri Sep 12 03:07:52 2008
@@ -125,7 +125,6 @@
 #define __pascal __stdcall
 
 #define CDECL _cdecl
-#define PASCAL _pascal
 
 #if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
 #define STDCALL __stdcall

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=36153&r1=36152&r2=36153&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Sep 12 03:07:52 2008
@@ -1526,9 +1526,6 @@
 #define IMAGE_ARCHIVE_PAD "\n"
 #define IMAGE_ARCHIVE_LINKER_MEMBER "/               "
 #define IMAGE_ARCHIVE_LONGNAMES_MEMBER "//              "
-#define IMAGE_ORDINAL_FLAG 0x80000000
-#define IMAGE_SNAP_BY_ORDINAL(o) ((o&IMAGE_ORDINAL_FLAG)!=0)
-#define IMAGE_ORDINAL(o) (o&0xffff)
 #define IMAGE_RESOURCE_NAME_IS_STRING 0x80000000
 #define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000
 #define IMAGE_DEBUG_TYPE_UNKNOWN 0
@@ -4843,6 +4840,15 @@
 
 /* TODO: Other architectures than X86 */
 #if defined(_M_IX86)
+#if defined(_MSC_VER)
+FORCEINLINE
+VOID
+MemoryBarrier (VOID)
+{
+    LONG Barrier;
+    __asm { xchg Barrier, eax }
+}
+#else
 FORCEINLINE
 VOID
 MemoryBarrier(VOID)
@@ -4850,6 +4856,7 @@
     LONG Barrier;
     __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory");
 }
+#endif
 #elif defined (_M_AMD64)
 #define MemoryBarrier()
 #elif defined(_M_PPC)