Merged revisions 69218 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69218 | mark.dickinson | 2009-02-02 21:11:16 +0000 (Mon, 02 Feb 2009) | 3 lines

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

diff --git a/Include/object.h b/Include/object.h
index 51e1c4a9133bf6d062db6869dd3f1aef84f0dbf8..c42e5290c8f35967a71dec925a9fe424b7c5d357 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 */