greg: Fix ishimoto4 - calling convention omitted from func defn

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index deea3d663321fd147b0dae6558c444a68452ca81..d5bb76ecc69bc7364bf2af982a4f4f809a5652ac 100644 (file)
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -813,7 +813,7 @@ class CFuncDefNode(FuncDefNode):
             arg_decls.append("...")
         if not arg_decls:
             arg_decls = ["void"]
-        entity = "%s(%s)" % (self.entry.func_cname,
+        entity = type.function_header_code(self.entry.func_cname,
             string.join(arg_decls, ","))
         if self.visibility == 'public':
             dll_linkage = "DL_EXPORT"

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index c95ada92d5a0a474857a5be3a35e54a12f363220..b7474288f7caa35ab4aff1c2ad19017346a9bfc6 100644 (file)
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -648,6 +648,10 @@ class CFuncType(CType):
         return self.return_type.declaration_code(
             "%s%s(%s)%s" % (cc, entity_code, arg_decl_code, exc_clause),
             for_display, dll_linkage, pyrex)
+       
+    def function_header_code(self, func_name, arg_code):
+        return "%s%s(%s)" % (self.calling_convention_prefix(),
+            func_name, arg_code)
 
     def signature_string(self):
         s = self.declaration_code("")