More work on pxd/public/api import/export

Cython/Compiler/ModuleNode.py

@@ -1006,6 +1006,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                 type = entry.type
 
                 if not definition and entry.defined_in_pxd:
+                    storage_class = "static "
+                    dll_linkage = None
                     type = CPtrType(type)
                 header = type.declaration_code(entry.cname,
                                                dll_linkage = dll_linkage)

Cython/Compiler/Symtab.py

@@ -582,7 +582,8 @@ class Scope(object):
                           api = 0, in_pxd = 0, modifiers = (), utility_code = None):
         # Add an entry for a C function.
         if not cname:
-            if api or visibility != 'private':
+            if (visibility == 'extern' or
+                visibility == 'public'and defining):
                 cname = name
             else:
                 cname = self.mangle(Naming.func_prefix, name)
@@ -612,6 +613,8 @@ class Scope(object):
                         entry.type = type
                 else:
                     error(pos, "Function signature does not match previous declaration")
+            entry.cname = cname
+            entry.func_cname = cname
         else:
             entry = self.add_cfunction(name, type, pos, cname, visibility, modifiers)
             entry.func_cname = cname

tests/compile/publicapi_cimport.pyx

+# mode: compile
+from publicapi_pxd_mix cimport *

tests/compile/publicapi_pxd_mix.pxd

@@ -49,12 +49,17 @@ cdef public api class Bar3 [type PyBar3_Type, object PyBar3_Object]: pass
 
 # --
 
-cdef inline     void bar0(): pass
+cdef extern from *:
+    void foo()
+
+cdef inline     void bar (): pass
+cdef            void bar0()
 cdef public     void bar1()
 cdef        api void bar2()
 cdef public api void bar3()
 
-cdef inline     void* spam0(object o) except NULL: return NULL
+cdef inline     void* spam (object o) except NULL: return NULL
+cdef            void* spam0(object o) except NULL
 cdef public     void* spam1(object o) except NULL
 cdef        api void* spam2(object o) nogil except NULL
 cdef public api void* spam3(object o) except NULL with gil

tests/compile/publicapi_pxd_mix.pyx

@@ -8,10 +8,12 @@ cdef class Bar1: pass
 cdef class Bar2: pass
 cdef class Bar3: pass
 
+cdef            void bar0(): pass
 cdef public     void bar1(): pass
 cdef        api void bar2(): pass
 cdef public api void bar3(): pass
 
+cdef            void* spam0(object o) except NULL: return NULL
 cdef public     void* spam1(object o) except NULL: return NULL
 cdef        api void* spam2(object o) nogil except NULL: return NULL
 cdef public api void* spam3(object o) except NULL with gil: return NULL