Merge ssize_t branch.

This commit is contained in:
Martin v. Löwis 2006-02-15 17:27:45 +00:00
parent 4482929734
commit 18e165558b
102 changed files with 2659 additions and 1677 deletions

View file

@ -680,7 +680,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
#ifdef Py_USING_UNICODE
char s_buffer[256];
#endif
int len;
Py_ssize_t len;
if (PyString_Check(v)) {
s = PyString_AS_STRING(v);
@ -699,7 +699,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
NULL))
return NULL;
s = s_buffer;
len = (int)strlen(s);
len = strlen(s);
}
#endif
else if (PyObject_AsCharBuffer(v, &s, &len)) {