Change type of tp_reserved from cmpfunc to (void *); remove definition

of cmpfunc.

diff --git a/Include/object.h b/Include/object.h
index 592ee0294d8902f9483d3b205e5e4dda187a7fdb..c71bca64be7de4476ac875cb79ceb55ec325ae31 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -274,7 +274,6 @@ typedef PyObject *(*getattrfunc)(PyObject *, char *);
 typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
 typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
 typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *);
-typedef int (*cmpfunc)(PyObject *, PyObject *);
 typedef PyObject *(*reprfunc)(PyObject *);
 typedef long (*hashfunc)(PyObject *);
 typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int);
@@ -297,7 +296,7 @@ typedef struct _typeobject {
        printfunc tp_print;
        getattrfunc tp_getattr;
        setattrfunc tp_setattr;
-       cmpfunc tp_reserved;
+       void *tp_reserved; /* formerly known as tp_compare */
        reprfunc tp_repr;
 
        /* Method suites for standard classes */