From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 3 Feb 2012 09:55:33 +0100
Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961
 (http://svn.webkit.org/repository/webkit/trunk@106560)

---
 Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h')

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)())
-- 
cgit v1.2.1