mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1111228 - Remove the MSVC2005 special casing from PseudoStack.h; r=BenWa
--HG-- extra : amend_source : c6adbc3ff76b040433e5b8af342a4aa4575f4bf0
This commit is contained in:
parent
d449986176
commit
375b130df0
@ -41,23 +41,7 @@ LinuxKernelMemoryBarrierFunc pLinuxKernelMemoryBarrier __attribute__((weak)) =
|
||||
# define STORE_SEQUENCER() pLinuxKernelMemoryBarrier()
|
||||
#elif defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_X64)
|
||||
# if defined(_MSC_VER)
|
||||
#if _MSC_VER > 1400
|
||||
# include <intrin.h>
|
||||
#else // _MSC_VER > 1400
|
||||
// MSVC2005 has a name collision bug caused when both <intrin.h> and <winnt.h> are included together.
|
||||
#ifdef _WINNT_
|
||||
# define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
||||
# define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
||||
# include <intrin.h>
|
||||
#else
|
||||
# include <intrin.h>
|
||||
# define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
||||
# define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
||||
#endif
|
||||
// Even though MSVC2005 has the intrinsic _ReadWriteBarrier, it fails to link to it when it's
|
||||
// not explicitly declared.
|
||||
# pragma intrinsic(_ReadWriteBarrier)
|
||||
#endif // _MSC_VER > 1400
|
||||
# define STORE_SEQUENCER() _ReadWriteBarrier();
|
||||
# elif defined(__INTEL_COMPILER)
|
||||
# define STORE_SEQUENCER() __memory_barrier();
|
||||
|
Loading…
Reference in New Issue
Block a user