From: Stefan Behnel Date: Wed, 14 Oct 2009 14:03:10 +0000 (+0200) Subject: fix new .pxd file and cimport it in python.pxd X-Git-Tag: 0.13.beta0~2^2~121^2~63 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f956c697d401b3b05a4c7285ad2cd2c43877688;p=cython.git fix new .pxd file and cimport it in python.pxd --- diff --git a/Cython/Includes/python.pxd b/Cython/Includes/python.pxd index 700318ff..7346ec87 100644 --- a/Cython/Includes/python.pxd +++ b/Cython/Includes/python.pxd @@ -125,6 +125,7 @@ from python_mem cimport * from python_tuple cimport * from python_list cimport * from python_object cimport * +from python_cobject cimport * from python_sequence cimport * from python_mapping cimport * from python_iterator cimport * diff --git a/Cython/Includes/python_cobject.pxd b/Cython/Includes/python_cobject.pxd index fc33c521..0c72fb44 100644 --- a/Cython/Includes/python_cobject.pxd +++ b/Cython/Includes/python_cobject.pxd @@ -8,29 +8,29 @@ cdef extern from "Python.h": # the new Capsules API. ########################################################################### - int PyCObject_Check(object p)¶ + int PyCObject_Check(object p) # Return true if its argument is a PyCObject. - object PyCObject_FromVoidPtr(void* cobj, void (*destr)(void *))¶ + object PyCObject_FromVoidPtr(void* cobj, void (*destr)(void *)) # Return value: New reference. # # Create a PyCObject from the void * cobj. The destr function will # be called when the object is reclaimed, unless it is NULL. - object PyCObject_FromVoidPtrAndDesc(void* cobj, void* desc, void (*destr)(void *, void *))¶ + object PyCObject_FromVoidPtrAndDesc(void* cobj, void* desc, void (*destr)(void *, void *)) # Return value: New reference. # # Create a PyCObject from the void * cobj. The destr function will # be called when the object is reclaimed. The desc argument can be # used to pass extra callback data for the destructor function. - void* PyCObject_AsVoidPtr(object self)¶ + void* PyCObject_AsVoidPtr(object self) # Return the object void * that the PyCObject self was created with. - void* PyCObject_GetDesc(object self)¶ + void* PyCObject_GetDesc(object self) # Return the description void * that the PyCObject self was created with. - int PyCObject_SetVoidPtr(object self, void* cobj)¶ + int PyCObject_SetVoidPtr(object self, void* cobj) # Set the void pointer inside self to cobj. The PyCObject must not # have an associated destructor. Return true on success, false on # failure.