summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-10-26 06:44:10 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-10-26 06:44:10 (GMT)
commit61ec0d32634eaa43bbe433628607c137d91736de (patch)
tree99dc612bd0d4ec5eb9f86376cbc0d4db0070d101
parent56cdf686fc4f7596d3c93d2a1525e661297fb557 (diff)
downloadcpython-61ec0d32634eaa43bbe433628607c137d91736de.zip
cpython-61ec0d32634eaa43bbe433628607c137d91736de.tar.gz
cpython-61ec0d32634eaa43bbe433628607c137d91736de.tar.bz2
Fix some Py_ssize_t warnings on Win64 that were probably bugs
-rw-r--r--Objects/bytesobject.c4
-rw-r--r--Objects/memoryobject.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index db475cd..94b59ca 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -108,7 +108,7 @@ PyObject *
PyBytes_FromStringAndSize(const char *bytes, Py_ssize_t size)
{
PyBytesObject *new;
- int alloc;
+ Py_ssize_t alloc;
assert(size >= 0);
@@ -1458,7 +1458,7 @@ return_self(PyBytesObject *self)
}
Py_LOCAL_INLINE(Py_ssize_t)
-countchar(const char *target, int target_len, char c, Py_ssize_t maxcount)
+countchar(const char *target, Py_ssize_t target_len, char c, Py_ssize_t maxcount)
{
Py_ssize_t count=0;
const char *start=target;
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 02f21ce..f0a45f6 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -78,7 +78,7 @@ memory_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
static void
_strided_copy_nd(char *dest, char *src, int nd, Py_ssize_t *shape,
- Py_ssize_t *strides, int itemsize, char fort)
+ Py_ssize_t *strides, Py_ssize_t itemsize, char fort)
{
int k;
Py_ssize_t outstride;
@@ -298,7 +298,7 @@ memory_format_get(PyMemoryViewObject *self)
static PyObject *
memory_itemsize_get(PyMemoryViewObject *self)
{
- return PyInt_FromLong(self->view.itemsize);
+ return PyInt_FromSsize_t(self->view.itemsize);
}
static PyObject *