Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 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/sip.h
View File

@@ -55,7 +55,7 @@ extern "C" {
* Define the SIP version number. * Define the SIP version number.
*/ */
#define SIP_VERSION 0x040c00 #define SIP_VERSION 0x040c00
#define SIP_VERSION_STR "4.12-snapshot-24f170d5c2dd" #define SIP_VERSION_STR "4.12-snapshot-93040d2c716c"
/* /*
@@ -298,13 +298,6 @@ typedef int sip_gilstate_t;
* Some convenient function pointers. * Some convenient function pointers.
*/ */
/*
* forward declare these structures
*/
struct _sipSimpleWrapper;
struct _sipTypeDef;
/* /*
* The operation an access function is being asked to perform. * The operation an access function is being asked to perform.
*/ */
@@ -315,6 +308,9 @@ typedef enum
ReleaseGuard /* Release the guard, if any. */ ReleaseGuard /* Release the guard, if any. */
} AccessFuncOp; } AccessFuncOp;
struct _sipSimpleWrapper;
struct _sipTypeDef;
typedef void *(*sipInitFunc)(struct _sipSimpleWrapper *, PyObject *, typedef void *(*sipInitFunc)(struct _sipSimpleWrapper *, PyObject *,
PyObject *, PyObject **, PyObject **, PyObject **); PyObject *, PyObject **, PyObject **, PyObject **);
typedef void *(*sipAccessFunc)(struct _sipSimpleWrapper *, AccessFuncOp); typedef void *(*sipAccessFunc)(struct _sipSimpleWrapper *, AccessFuncOp);

12
sip/siplib/siplib.c
View File

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

8
sip/siplib/voidptr.c
View File

@@ -438,7 +438,7 @@ static PyObject *sipVoidPtr_subscript(PyObject *self, PyObject *key)
return NULL; return NULL;
} }
return make_voidptr(v->voidptr + start, slicelength, v->rw); return make_voidptr((char *)v->voidptr + start, slicelength, v->rw);
} }
bad_key(key); bad_key(key);
@@ -522,7 +522,7 @@ static int sipVoidPtr_ass_subscript(PyObject *self, PyObject *key,
return -1; return -1;
} }
memmove(v->voidptr + start, value_view.buf, size); memmove((char *)v->voidptr + start, value_view.buf, size);
PyBuffer_Release(&value_view); PyBuffer_Release(&value_view);
#else #else
@@ -532,7 +532,7 @@ static int sipVoidPtr_ass_subscript(PyObject *self, PyObject *key,
if (check_slice_size(size, value_size) < 0) if (check_slice_size(size, value_size) < 0)
return -1; return -1;
memmove(v->voidptr + start, value_ptr, size); memmove((char *)v->voidptr + start, value_ptr, size);
#endif #endif
return 0; return 0;
@@ -638,7 +638,7 @@ static PyBufferProcs sipVoidPtr_BufferProcs = {
sipVoidPtr_getwritebuffer, /* bf_getwritebuffer */ sipVoidPtr_getwritebuffer, /* bf_getwritebuffer */
sipVoidPtr_getsegcount, /* bf_getsegcount */ sipVoidPtr_getsegcount, /* bf_getsegcount */
#if PY_VERSION_HEX >= 0x02050000 #if PY_VERSION_HEX >= 0x02050000
sipVoidPtr_getreadbuffer, /* bf_getcharbuffer */ (charbufferproc)sipVoidPtr_getreadbuffer, /* bf_getcharbuffer */
#if PY_VERSION_HEX >= 0x02060000 #if PY_VERSION_HEX >= 0x02060000
sipVoidPtr_getbuffer, /* bf_getbuffer */ sipVoidPtr_getbuffer, /* bf_getbuffer */
0 /* bf_releasebuffer */ 0 /* bf_releasebuffer */