Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 5c4cdae69c528a7ae802f2fd07e310b2 > files > 9

python-perlmodule-1.0.1d-14.mga3.src.rpm

--- pyperl-1.0.1d/perlmodule.c.python2.5	2007-10-16 11:42:41.000000000 +0200
+++ pyperl-1.0.1d/perlmodule.c	2007-10-20 07:43:38.000000000 +0200
@@ -182,7 +182,7 @@ call_perl(char *method, SV* obj, I32 gim
 
     /* push keyword arguments too if there are any */
     if (keywds) {
-    int pos = 0;
+    Py_ssize_t pos = 0;
     PyObject *key;
     char *key_str;
     PyObject *val;
--- pyperl-1.0.1d/svrv_object.c.python2.5	2007-10-16 11:42:41.000000000 +0200
+++ pyperl-1.0.1d/svrv_object.c	2007-10-20 08:00:05.000000000 +0200
@@ -107,11 +107,7 @@ pysvrv_dealloc(PySVRV *self)
 #endif
 
     ENTER_PYTHON;
-#if PY_MAJOR_VERSION >= 1 && PY_MINOR_VERSION >= 6
     PyObject_DEL(self);
-#else
-    PyMem_DEL(self);
-#endif
     ASSERT_LOCK_PYTHON;
 }
 
@@ -1412,11 +1408,11 @@ type_error(char *msg, SV* sv)
 }
 
 
-static int
+static Py_ssize_t
 pysvrv_length(PySVRV *self)
 {
     SV* sv;
-    int len;
+    Py_ssize_t len;
     dCTX;
 
     ASSERT_LOCK_PYTHON;
@@ -1471,7 +1467,7 @@ pysvrv_nonzero(PySVRV *self)
 
 
 static PyObject *
-pysvrv_item(PySVRV *self, int index)
+pysvrv_item(PySVRV *self, Py_ssize_t index)
 {
     SV* sv;
     PyObject *item;
@@ -1766,7 +1762,7 @@ DONE:
 
 
 static PyObject *
-pysvrv_repeat(PySVRV *self, int n)
+pysvrv_repeat(PySVRV *self, Py_ssize_t n)
 {
     SV* sv;
     PyObject *pyo_res;
@@ -1833,7 +1829,7 @@ pysvrv_repeat(PySVRV *self, int n)
 
 
 static PyObject *
-pysvrv_slice(PySVRV *self, int ilow, int ihigh)
+pysvrv_slice(PySVRV *self, Py_ssize_t ilow, Py_ssize_t ihigh)
 {
     SV* sv;
     PyObject *pyo_res;
@@ -1899,7 +1895,7 @@ pysvrv_slice(PySVRV *self, int ilow, int
 }
 
 static int
-pysvrv_ass_slice(PySVRV *self, int ilow, int ihigh, PyObject *v)
+pysvrv_ass_slice(PySVRV *self, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
 {
     SV* sv;
     int status;  /* return value */
@@ -2001,22 +1997,20 @@ static PyNumberMethods pysvrv_as_number 
 };
 
 static PyMappingMethods pysvrv_as_mapping = {
-    (inquiry)pysvrv_length, /* mp_length */
+    (lenfunc)pysvrv_length, /* mp_length */
     (binaryfunc)pysvrv_subscript, /* mp_subscript */
     (objobjargproc)pysvrv_ass_sub, /* mp_ass_subscript */
 };
 
 static PySequenceMethods pysvrv_as_sequence = {
-    (inquiry)pysvrv_length, /*sq_length*/
+    (lenfunc)pysvrv_length, /*sq_length*/
     (binaryfunc)pysvrv_concat, /*sq_concat*/
-    (intargfunc)pysvrv_repeat, /*sq_repeat*/
-    (intargfunc)pysvrv_item, /*sq_item*/
-    (intintargfunc)pysvrv_slice, /*sq_slice*/
+    (ssizeargfunc)pysvrv_repeat, /*sq_repeat*/
+    (ssizeargfunc)pysvrv_item, /*sq_item*/
+    (ssizessizeargfunc)pysvrv_slice, /*sq_slice*/
     0, /*sq_ass_item*/
-    (intintobjargproc)pysvrv_ass_slice, /*sq_ass_slice*/
-#if PY_MAJOR_VERSION >= 1 && PY_MINOR_VERSION >= 6
+    (ssizessizeobjargproc)pysvrv_ass_slice, /*sq_ass_slice*/
     0, /*sq_contains*/
-#endif
 };