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

update siplib

Browse Source
This commit is contained in:
Robin Dunn
2018-10-03 09:57:01 -07:00
parent e1581936b5
commit 99f93e6bc5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sip/siplib/sip.h
View File

@@ -55,7 +55,7 @@ extern "C" {
* Define the SIP version number.
*/
#define SIP_VERSION 0x04130d
#define SIP_VERSION_STR "4.19.13.dev1808121705"
#define SIP_VERSION_STR "4.19.13"
/*

5
sip/siplib/siplib.c
View File

@@ -53,7 +53,8 @@
#define STRINGIFY_EX(s) #s
#define STRINGIFY(s) STRINGIFY_EX(s)
#define SIP_MODULE_NAME_STR STRINGIFY(SIP_MODULE_NAME)
#define SIP_MODULE_NAME_STR STRINGIFY(SIP_MODULE_NAME)
#define SIP_MODULE_BASENAME_STR STRINGIFY(SIP_MODULE_BASENAME)
/*
* The Python metatype for a C++ wrapper type. We inherit everything from the
@@ -1261,7 +1262,7 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
* Also install the package-specific module at the top level for backwards
* compatibility.
*/
if (strcmp(SIP_MODULE_NAME_STR, "sip") != 0)
if (strcmp(SIP_MODULE_NAME_STR, "sip") != 0 && strcmp(SIP_MODULE_BASENAME_STR, "sip") == 0)
{
PyObject *modules = PySys_GetObject("modules");