[Python-3000-checkins] r58665 - python/branches/py3k/Objects/bytesobject.c python/branches/py3k/Objects/memoryobject.c
neal.norwitz
python-3000-checkins at python.org
Fri Oct 26 08:44:10 CEST 2007
Author: neal.norwitz
Date: Fri Oct 26 08:44:10 2007
New Revision: 58665
Modified:
python/branches/py3k/Objects/bytesobject.c
python/branches/py3k/Objects/memoryobject.c
Log:
Fix some Py_ssize_t warnings on Win64 that were probably bugs
Modified: python/branches/py3k/Objects/bytesobject.c
==============================================================================
--- python/branches/py3k/Objects/bytesobject.c (original)
+++ python/branches/py3k/Objects/bytesobject.c Fri Oct 26 08:44:10 2007
@@ -108,7 +108,7 @@
PyBytes_FromStringAndSize(const char *bytes, Py_ssize_t size)
{
PyBytesObject *new;
- int alloc;
+ Py_ssize_t alloc;
assert(size >= 0);
@@ -1458,7 +1458,7 @@
}
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;
Modified: python/branches/py3k/Objects/memoryobject.c
==============================================================================
--- python/branches/py3k/Objects/memoryobject.c (original)
+++ python/branches/py3k/Objects/memoryobject.c Fri Oct 26 08:44:10 2007
@@ -78,7 +78,7 @@
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 @@
static PyObject *
memory_itemsize_get(PyMemoryViewObject *self)
{
- return PyInt_FromLong(self->view.itemsize);
+ return PyInt_FromSsize_t(self->view.itemsize);
}
static PyObject *
More information about the Python-3000-checkins
mailing list