mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-12-16 09:40:07 +01:00
Merge pull request #237 from RobinD42/sip-4.19.1
Update sip to 4.19.1 release
This commit is contained in:
10
build.py
10
build.py
@@ -68,12 +68,12 @@ wxICON = 'docs/sphinx/_static/images/sphinxdocs/mondrian.png'
|
||||
|
||||
# Some tools will be downloaded for the builds. These are the versions and
|
||||
# MD5s of the tool binaries currently in use.
|
||||
sipCurrentVersion = '4.19.1.dev1702021705'
|
||||
sipCurrentVersion = '4.19.1'
|
||||
sipMD5 = {
|
||||
'darwin' : '2c54e223f88ef998e770cfe27139c80f',
|
||||
'win32' : '5d58bc5106185925f5b05fde0c7e87c8',
|
||||
'linux32' : 'dc0e17e86b56be994567b636aeef740e',
|
||||
'linux64' : '3699bb2d59692623dc1fa212237da335',
|
||||
'darwin' : '864b8b4b2d25594b052093cbcf3af639',
|
||||
'win32' : '08cb7b0ca7e4d16f6029c2ed3849a848',
|
||||
'linux32' : 'a63b59202a8d60e52f7731e484ef1291',
|
||||
'linux64' : 'ae56352f033212c94d3adfd2f48a0070',
|
||||
}
|
||||
|
||||
wafCurrentVersion = '1.7.15-p1'
|
||||
|
||||
@@ -55,7 +55,7 @@ extern "C" {
|
||||
* Define the SIP version number.
|
||||
*/
|
||||
#define SIP_VERSION 0x041301
|
||||
#define SIP_VERSION_STR "4.19.1.dev1702021705"
|
||||
#define SIP_VERSION_STR "4.19.1"
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -9914,11 +9914,11 @@ static int sipWrapperType_init(sipWrapperType *self, PyObject *args,
|
||||
*/
|
||||
if (base != NULL && PyObject_TypeCheck((PyObject *)base, (PyTypeObject *)&sipWrapperType_Type))
|
||||
{
|
||||
/* Call any new type handler. */
|
||||
sipNewUserTypeFunc new_user_type_handler;
|
||||
|
||||
self->wt_td = ((sipWrapperType *)base)->wt_td;
|
||||
|
||||
/* Call any new type handler. */
|
||||
new_user_type_handler = find_new_user_type_handler(
|
||||
(sipWrapperType *)sipTypeAsPyTypeObject(self->wt_td));
|
||||
|
||||
@@ -13482,7 +13482,7 @@ static int sip_api_enable_gc(int enable)
|
||||
return -1;
|
||||
|
||||
/* Get the functions if we haven't already got them. */
|
||||
if (enable == NULL)
|
||||
if (enable_func == NULL)
|
||||
{
|
||||
PyObject *gc_module;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user