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

update siplib from new upstream code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@66318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2010-12-04 00:23:08 +00:00
parent 971d058e6b
commit 84c12b120b
2 changed files with 8 additions and 22 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 0x040c00
#define SIP_VERSION_STR "4.12-snapshot-d92b54039599"
#define SIP_VERSION_STR "4.12-snapshot-b2f993d3a067"
/*

28
sip/siplib/siplib.c
View File

@@ -1911,29 +1911,15 @@ static PyObject *buildObject(PyObject *obj, const char *fmt, va_list va)
break;
case 'd': // double
case 'f': // float
case 'd':
case 'f':
el = PyFloat_FromDouble(va_arg(va, double));
break;
case 'e':
case 'i':
#if PY_MAJOR_VERSION >= 3
el = PyLong_FromLong(va_arg(va, int));
#else
el = PyInt_FromLong(va_arg(va, int));
#endif
break;
case 'L':
#if PY_MAJOR_VERSION >= 3
el = PyLong_FromLong(va_arg(va, int));
#else
el = PyInt_FromLong(va_arg(va, int));
#endif
break;
case 'h':
case 'i':
case 'L':
#if PY_MAJOR_VERSION >= 3
el = PyLong_FromLong(va_arg(va, int));
#else
@@ -2021,9 +2007,9 @@ static PyObject *buildObject(PyObject *obj, const char *fmt, va_list va)
break;
case 'u': /* unsigned */
case 'M': /* unsigned char */
case 't': /* unsigned short */
case 't':
case 'u':
case 'M':
el = PyLong_FromUnsignedLong(va_arg(va, unsigned));
break;