From 3922d99122b97a026958d8443a1cfb3f18271a75 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 2 Feb 2009 21:16:47 +0000 Subject: [PATCH] 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. ........ --- Include/object.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Include/object.h b/Include/object.h index 51e1c4a9133b..c42e5290c8f3 100644 --- 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 */ -- 2.47.3