Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated siplib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/sandbox/trunk/Phoenix@66196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2010-11-18 08:27:15 +00:00
parent 5d686a914f
commit d98847ea83
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sip/siplib/siplib.c
View File

@@ -6068,13 +6068,17 @@ static PyObject *create_property(sipVariableDef *vd)
doc = Py_None;
Py_INCREF(doc);
}
#if PY_MAJOR_VERSION >= 3
else if ((doc = PyUnicode_FromString(vd->vd_docstring)) == NULL)
#else
else if ((doc = PyString_FromString(vd->vd_docstring)) == NULL)
#endif
{
goto done;
}
descr = PyObject_CallFunctionObjArgs(&PyProperty_Type, fget, fset, fdel,
doc, NULL);
descr = PyObject_CallFunctionObjArgs((PyObject *)&PyProperty_Type, fget,
fset, fdel, doc, NULL);
done:
Py_XDECREF(fget);
@@ -8031,9 +8035,9 @@ static int compareTypeDef(const void *key, const void *el)
/* Find which external type it is. */
while (etd->et_nr >= 0)
{
const sipTypeDef **tdp = &module_searched->em_types[etd->et_nr];
const void *tdp = &module_searched->em_types[etd->et_nr];
if (tdp == (const sipTypeDef **)el)
if (tdp == el)
{
s2 = etd->et_name;
break;