mirror of
https://github.com/reactos/reactos.git
synced 2024-08-04 18:40:59 +00:00
fix redefinitions
add MemoryBarrier for MSVC svn path=/trunk/; revision=36153
This commit is contained in:
parent
5f008ce5b8
commit
6534076957
|
@ -125,7 +125,6 @@ extern "C" {
|
||||||
#define __pascal __stdcall
|
#define __pascal __stdcall
|
||||||
|
|
||||||
#define CDECL _cdecl
|
#define CDECL _cdecl
|
||||||
#define PASCAL _pascal
|
|
||||||
|
|
||||||
#if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
|
#if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
|
||||||
#define STDCALL __stdcall
|
#define STDCALL __stdcall
|
||||||
|
|
|
@ -1526,9 +1526,6 @@ typedef enum
|
||||||
#define IMAGE_ARCHIVE_PAD "\n"
|
#define IMAGE_ARCHIVE_PAD "\n"
|
||||||
#define IMAGE_ARCHIVE_LINKER_MEMBER "/ "
|
#define IMAGE_ARCHIVE_LINKER_MEMBER "/ "
|
||||||
#define IMAGE_ARCHIVE_LONGNAMES_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_NAME_IS_STRING 0x80000000
|
||||||
#define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000
|
#define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000
|
||||||
#define IMAGE_DEBUG_TYPE_UNKNOWN 0
|
#define IMAGE_DEBUG_TYPE_UNKNOWN 0
|
||||||
|
@ -4843,6 +4840,15 @@ BitScanReverse(OUT ULONG *Index,
|
||||||
|
|
||||||
/* TODO: Other architectures than X86 */
|
/* TODO: Other architectures than X86 */
|
||||||
#if defined(_M_IX86)
|
#if defined(_M_IX86)
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
FORCEINLINE
|
||||||
|
VOID
|
||||||
|
MemoryBarrier (VOID)
|
||||||
|
{
|
||||||
|
LONG Barrier;
|
||||||
|
__asm { xchg Barrier, eax }
|
||||||
|
}
|
||||||
|
#else
|
||||||
FORCEINLINE
|
FORCEINLINE
|
||||||
VOID
|
VOID
|
||||||
MemoryBarrier(VOID)
|
MemoryBarrier(VOID)
|
||||||
|
@ -4850,6 +4856,7 @@ MemoryBarrier(VOID)
|
||||||
LONG Barrier;
|
LONG Barrier;
|
||||||
__asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory");
|
__asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#elif defined (_M_AMD64)
|
#elif defined (_M_AMD64)
|
||||||
#define MemoryBarrier()
|
#define MemoryBarrier()
|
||||||
#elif defined(_M_PPC)
|
#elif defined(_M_PPC)
|
||||||
|
|
Loading…
Reference in a new issue