Author: mattip <matti.pi...@gmail.com>
Branch: cpyext-ext
Changeset: r83318:158eb5d4ebd0
Date: 2016-03-24 00:50 +0200
http://bitbucket.org/pypy/pypy/changeset/158eb5d4ebd0/
Log: fix merge
diff --git a/pypy/module/cpyext/include/unicodeobject.h
b/pypy/module/cpyext/include/unicodeobject.h
--- a/pypy/module/cpyext/include/unicodeobject.h
+++ b/pypy/module/cpyext/include/unicodeobject.h
@@ -21,7 +21,7 @@
typedef struct {
PyObject_HEAD
Py_UNICODE *str;
- Py_ssize_t length;
+ Py_ssize_t size;
long hash; /* Hash value; -1 if not set */
PyObject *defenc; /* (Default) Encoded version as Python
string, or NULL; this is used for
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
