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

update siplib

Browse Source
This commit is contained in:
Robin Dunn
2020-09-16 15:52:07 -07:00
parent 257c06ba20
commit 4a6c6d2f86
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sip/siplib/qtlib.c
View File

@@ -2,7 +2,7 @@
* The SIP library code that implements the interface to the optional module
* supplied Qt support.
*
* Copyright (c) 2016 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2020 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -218,7 +218,7 @@ PyObject *sip_api_invoke_slot_ex(const sipSlot *slot, PyObject *sigargs,
{
PyObject *nsa, *xtype, *xvalue, *xtb, *resobj;
if ((resobj = PyEval_CallObject(sfunc, sa)) != NULL)
if ((resobj = PyObject_CallObject(sfunc, sa)) != NULL)
{
Py_DECREF(sfunc);
Py_XDECREF(sref);

4
sip/siplib/sip.h
View File

@@ -54,8 +54,8 @@ extern "C" {
/*
* Define the SIP version number.
*/
#define SIP_VERSION 0x041317
#define SIP_VERSION_STR "4.19.23"
#define SIP_VERSION 0x041318
#define SIP_VERSION_STR "4.19.24"
/*

10
sip/siplib/siplib.c
View File

@@ -297,6 +297,9 @@ static sipWrapperType sipWrapper_Type = {
0, /* ht_qualname */
0, /* ht_cached_keys */
#endif
#if PY_VERSION_HEX >= 0x03090000
0, /* ht_module */
#endif
#if !defined(STACKLESS)
},
#endif
@@ -1128,7 +1131,7 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
#error "Add support for capsule variables"
#endif
#ifdef WITH_THREAD
#if PY_VERSION_HEX < 0x03070000 && defined(WITH_THREAD)
PyEval_InitThreads();
#endif
@@ -2337,7 +2340,7 @@ static PyObject *call_method(PyObject *method, const char *fmt, va_list va)
return NULL;
if (buildObject(args, fmt, va) != NULL)
res = PyEval_CallObject(method, args);
res = PyObject_CallObject(method, args);
else
res = NULL;
@@ -11679,6 +11682,9 @@ sipWrapperType sipSimpleWrapper_Type = {
0, /* ht_qualname */
0, /* ht_cached_keys */
#endif
#if PY_VERSION_HEX >= 0x03090000
0, /* ht_module */
#endif
#if !defined(STACKLESS)
},
#endif