Build fix attempt for r96286.

* assembler/MacroAssemblerCodeRef.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index a07bc97..9ae4268 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix attempt for r96286.
+
+        * assembler/MacroAssemblerCodeRef.h:
+
 2011-09-28  Gavin Barraclough  <barraclough@apple.com>
 
         DFG JIT Operations on 32_64 should use stdcall calling convention.

diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h
index 900f981..9921044 100644 (file)
--- a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h
@@ -71,6 +71,8 @@ public:
     {
     }
 
+#if !CALLING_CONVENTION_IS_CDECL
+
     template<typename returnType>
     FunctionPtr(returnType(*value)())
         : m_value((void*)value)
@@ -106,7 +108,7 @@ public:
         ASSERT_VALID_CODE_POINTER(m_value);
     }
 
-#ifdef CALLING_CONVENTION_IS_CDECL
+#else
 #define STDCALL __attribute__ ((stdcall))
     template<typename returnType>
     FunctionPtr(returnType STDCALL(*value)())