summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorNeil Schemenauer <nascheme@enme.ucalgary.ca>2007-09-21 20:19:23 (GMT)
committerNeil Schemenauer <nascheme@enme.ucalgary.ca>2007-09-21 20:19:23 (GMT)
commit16c7075164abe85f7cf750d6b63ee2b5ddaa2f54 (patch)
treefffa0bfcdd832cc4d5cb323748b74c13796344e6 /Include
parent8ce81f767a48e9e645c523137c7f83e49f79f986 (diff)
downloadcpython-16c7075164abe85f7cf750d6b63ee2b5ddaa2f54.zip
cpython-16c7075164abe85f7cf750d6b63ee2b5ddaa2f54.tar.gz
cpython-16c7075164abe85f7cf750d6b63ee2b5ddaa2f54.tar.bz2
Remove more cruft leftover from nb_coerce. Rename nb_coerce to
nb_reserved.
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/Include/object.h b/Include/object.h
index c4a5cba..d03c888 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -133,7 +133,6 @@ typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *);
typedef int (*inquiry)(PyObject *);
typedef Py_ssize_t (*lenfunc)(PyObject *);
-typedef int (*coercion)(PyObject **, PyObject **);
typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
@@ -222,7 +221,7 @@ typedef struct {
binaryfunc nb_and;
binaryfunc nb_xor;
binaryfunc nb_or;
- coercion nb_coerce;
+ int nb_reserved; /* unused, used to be nb_coerce */
unaryfunc nb_int;
unaryfunc nb_long;
unaryfunc nb_float;