catacomb-python.h: Don't inhibit 64-bit type detection any more.

[catacomb-python] / buffer.c

diff --git a/buffer.c b/buffer.c
index 507e6b8a753c97f811362f626d2c130498c372f4..7e1744961ba36fa24ecf014743965f237cb9d824 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -77,10 +77,10 @@ static void buf_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
   FREEOBJ(me);
 }
 

-static int rbuf_pysegcount(PyObject *me, int *nn)
+static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn)

   { if (nn) *nn = BSZ(BUF_B(me)); return (1); }
 
   { if (nn) *nn = BSZ(BUF_B(me)); return (1); }
 

-static int rbuf_pyreadbuf(PyObject *me, int seg, void **q)
+static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)

   { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); }
 
 static PyObject *rbmeth_skip(PyObject *me, PyObject *arg)
   { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); }
 
 static PyObject *rbmeth_skip(PyObject *me, PyObject *arg)


@@ -367,10 +367,10 @@ end:
   return ((PyObject *)me);
 }
 
   return ((PyObject *)me);
 }
 

-static int wbuf_pysegcount(PyObject *me, int *nn)
+static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn)

   { if (nn) *nn = BLEN(BUF_B(me)); return (1); }
 
   { if (nn) *nn = BLEN(BUF_B(me)); return (1); }
 

-static int wbuf_pyreadbuf(PyObject *me, int seg, void **q)
+static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)

   { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); }
 
 static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)
   { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); }
 
 static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)


@@ -390,7 +390,7 @@ static PyObject *wbmeth_put(PyObject *me, PyObject *arg)
   int n;
   if (!PyArg_ParseTuple(arg, "s#:put", &p, &n)) return (0);
   ensure(me, n);
   int n;
   if (!PyArg_ParseTuple(arg, "s#:put", &p, &n)) return (0);
   ensure(me, n);

-  buf_put(BUF_B(me), p, n); assert(BOK(BUF_B(m)));
+  buf_put(BUF_B(me), p, n); assert(BOK(BUF_B(me)));

   RETURN_ME;
 }
 
   RETURN_ME;
 }