diff options
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h index 82e8c4151..c59d1514a 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h @@ -52,7 +52,7 @@ #define ASSERT_VALID_CODE_OFFSET(offset) // Anything goes! #endif -#if CPU(X86) && OS(WIN) +#if CPU(X86) && OS(WINDOWS) #define CALLING_CONVENTION_IS_STDCALL 1 #ifndef CDECL #if COMPILER(MSVC) @@ -126,7 +126,9 @@ public: ASSERT_VALID_CODE_POINTER(m_value); } -#if CALLING_CONVENTION_IS_STDCALL +// MSVC doesn't seem to treat functions with different calling conventions as +// different types; these methods already defined for fastcall, below. +#if CALLING_CONVENTION_IS_STDCALL && !OS(WINDOWS) template<typename returnType> FunctionPtr(returnType (CDECL *value)()) |