Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes needed for building with Python 2.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-07-05 00:43:02 +00:00
parent a608c09d85
commit d7ab65f80d
1 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
wxPython/SWIG/swig-1.3.29.patch
View File

@@ -4,7 +4,7 @@ RCS file: /cvsroot/swig/SWIG/Makefile.in,v
retrieving revision 1.103
diff -u -4 -r1.103 Makefile.in
--- Makefile.in 10 Mar 2006 22:54:02 -0000 1.103
+++ Makefile.in 28 Jun 2006 23:47:45 -0000
+++ Makefile.in 5 Jul 2006 00:38:47 -0000
@@ -21,9 +21,9 @@
source:
@@ -33,7 +33,7 @@ RCS file: /cvsroot/swig/SWIG/Lib/typemaps/exception.swg,v
retrieving revision 1.8
diff -u -4 -r1.8 exception.swg
--- Lib/typemaps/exception.swg 7 Mar 2006 00:14:10 -0000 1.8
+++ Lib/typemaps/exception.swg 28 Jun 2006 23:47:45 -0000
+++ Lib/typemaps/exception.swg 5 Jul 2006 00:38:47 -0000
@@ -12,9 +12,9 @@
/* macros for error manipulation */
@@ -51,7 +51,7 @@ RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
retrieving revision 1.203
diff -u -4 -r1.203 python.cxx
--- Source/Modules/python.cxx 16 Mar 2006 01:46:50 -0000 1.203
+++ Source/Modules/python.cxx 28 Jun 2006 23:47:46 -0000
+++ Source/Modules/python.cxx 5 Jul 2006 00:38:47 -0000
@@ -39,9 +39,8 @@
static File *f_directors_h = 0;
static File *f_init = 0;
@@ -140,7 +140,7 @@ RCS file: /cvsroot/swig/SWIG/Source/Swig/misc.c,v
retrieving revision 1.57
diff -u -4 -r1.57 misc.c
--- Source/Swig/misc.c 6 Mar 2006 22:51:00 -0000 1.57
+++ Source/Swig/misc.c 28 Jun 2006 23:47:46 -0000
+++ Source/Swig/misc.c 5 Jul 2006 00:38:47 -0000
@@ -899,8 +899,26 @@
}
#endif
@@ -186,7 +186,7 @@ RCS file: /cvsroot/swig/SWIG/Lib/python/pyinit.swg,v
retrieving revision 1.32
diff -u -4 -r1.32 pyinit.swg
--- Lib/python/pyinit.swg 2 Feb 2006 23:48:56 -0000 1.32
+++ Lib/python/pyinit.swg 28 Jun 2006 23:47:46 -0000
+++ Lib/python/pyinit.swg 5 Jul 2006 00:38:47 -0000
@@ -225,13 +225,13 @@
swig_type_info **types,
swig_type_info **types_initial) {
@@ -203,3 +203,52 @@ diff -u -4 -r1.32 pyinit.swg
if (strncmp(const_table[j].name, name,
strlen(const_table[j].name)) == 0) {
ci = &(const_table[j]);
Index: Lib/python/pyrun.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pyrun.swg,v
retrieving revision 1.141
diff -u -4 -r1.141 pyrun.swg
--- Lib/python/pyrun.swg 7 Mar 2006 00:35:17 -0000 1.141
+++ Lib/python/pyrun.swg 5 Jul 2006 00:38:47 -0000
@@ -11,8 +11,12 @@
* ----------------------------------------------------------------------------- */
/* Common SWIG API */
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#endif
+
/* for raw pointers */
#define SWIG_Python_ConvertPtr(obj, pptr, type, flags) SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
#define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Python_ConvertPtr(obj, pptr, type, flags)
#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own) SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
@@ -1074,9 +1078,9 @@
} else {
void *vptr = 0;
/* here we get the method pointer for callbacks */
- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
if (desc) {
desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
if (!desc) return SWIG_ERROR;
Index: Lib/python/pystrings.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/python/pystrings.swg,v
retrieving revision 1.27
diff -u -4 -r1.27 pystrings.swg
--- Lib/python/pystrings.swg 23 Feb 2006 21:43:33 -0000 1.27
+++ Lib/python/pystrings.swg 5 Jul 2006 00:38:47 -0000
@@ -5,9 +5,9 @@
SWIGINTERN int
SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
{
if (PyString_Check(obj)) {
- char *cstr; int len;
+ char *cstr; Py_size_t len;
PyString_AsStringAndSize(obj, &cstr, &len);
if (cptr) {
if (alloc) {
/*