From 26812517f125b63e09baa34e3eb73e6a4992c4ee Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Jan 05 2007 22:56:58 +0000 Subject: Added fixes for python 2.5 support from upstream CVS --- diff --git a/cyphesis-0.5.10-python2.5.patch b/cyphesis-0.5.10-python2.5.patch index 920fd91..addf1ea 100644 --- a/cyphesis-0.5.10-python2.5.patch +++ b/cyphesis-0.5.10-python2.5.patch @@ -203,3 +203,28 @@ PYTHON_VERSION=${python_version} PYTHON_INCLUDES=${python_include_path} CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +--- rulesets/Py_Operation.cpp 26 Oct 2006 00:48:11 -0000 1.53 ++++ rulesets/Py_Operation.cpp 4 Jan 2007 18:49:59 -0000 1.54 +@@ -469,15 +469,20 @@ + 0 + }; + ++#if PY_MINOR_VERSION < 5 ++#define lenfunc inquiry ++#define ssizeargfunc intargfunc ++#endif ++ + /* + * Operation sequence methods structure. + */ + + static PySequenceMethods Operation_seq = { +- (inquiry)Operation_seq_length, /* sq_length */ ++ (lenfunc)Operation_seq_length, /* sq_length */ + NULL, /* sq_concat */ + NULL, /* sq_repeat */ +- (intargfunc)Operation_seq_item, /* sq_item */ ++ (ssizeargfunc)Operation_seq_item, /* sq_item */ + NULL, /* sq_slice */ + NULL, /* sq_ass_item */ + NULL /* sq_ass_slice */