Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 15:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix redefinitions

Browse source 
add MemoryBarrier for MSVC

svn path=/trunk/; revision=36153
This commit is contained in:
Christoph von Wittich 2008-09-12 08:07:52 +00:00
parent 5f008ce5b8
commit 6534076957
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/include/psdk/windef.h
View file

@ -125,7 +125,6 @@ extern "C" {
#define __pascal __stdcall
#define CDECL _cdecl
#define PASCAL _pascal
#if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
#define STDCALL __stdcall

13
reactos/include/psdk/winnt.h
View file

@ -1526,9 +1526,6 @@ typedef enum
#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 @@ BitScanReverse(OUT ULONG *Index,
/* 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 @@ MemoryBarrier(VOID)
LONG Barrier;
__asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory");
}
#endif
#elif defined (_M_AMD64)
#define MemoryBarrier()
#elif defined(_M_PPC)