Commit 460c77c1 authored by Robert Bradshaw's avatar Robert Bradshaw

Merge branch 'jdemeyer-cdef_public_dll_linkage'

parents c824a382 d8ad4794
...@@ -74,6 +74,8 @@ Other changes ...@@ -74,6 +74,8 @@ Other changes
* Access to Python attributes of cimported modules without the corresponding * Access to Python attributes of cimported modules without the corresponding
import is now a compile-time (rather than runtime) error. import is now a compile-time (rather than runtime) error.
* Do not use special dll linkage for "cdef public" functions.
0.25.2 (2016-12-08) 0.25.2 (2016-12-08)
=================== ===================
......
...@@ -218,8 +218,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -218,8 +218,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
def generate_public_declaration(self, entry, h_code, i_code): def generate_public_declaration(self, entry, h_code, i_code):
h_code.putln("%s %s;" % ( h_code.putln("%s %s;" % (
Naming.extern_c_macro, Naming.extern_c_macro,
entry.type.declaration_code( entry.type.declaration_code(entry.cname)))
entry.cname, dll_linkage="DL_IMPORT")))
if i_code: if i_code:
i_code.putln("cdef extern %s" % ( i_code.putln("cdef extern %s" % (
entry.type.declaration_code(entry.cname, pyrex=1))) entry.type.declaration_code(entry.cname, pyrex=1)))
...@@ -2872,7 +2871,7 @@ def generate_cfunction_declaration(entry, env, code, definition): ...@@ -2872,7 +2871,7 @@ def generate_cfunction_declaration(entry, env, code, definition):
dll_linkage = "DL_IMPORT" dll_linkage = "DL_IMPORT"
elif entry.visibility == 'public': elif entry.visibility == 'public':
storage_class = Naming.extern_c_macro storage_class = Naming.extern_c_macro
dll_linkage = "DL_EXPORT" dll_linkage = None
elif entry.visibility == 'private': elif entry.visibility == 'private':
storage_class = "static" storage_class = "static"
dll_linkage = None dll_linkage = None
......
module_api
complex_numbers_c89_T398_long_double complex_numbers_c89_T398_long_double
complex_numbers_T305_long_double complex_numbers_T305_long_double
int_float_builtins_as_casts_T400_long_double int_float_builtins_as_casts_T400_long_double
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment