[Python-checkins] r69221 - in python/branches/release30-maint: Include/object.h

Mon Feb 2 22:16:47 CET 2009

Author: mark.dickinson
Date: Mon Feb 2 22:16:47 2009
New Revision: 69221
Log:
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 (2009年2月02日) | 3 lines
 
 Change type of tp_reserved from cmpfunc to (void *); remove definition
 of cmpfunc.
........
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Include/object.h
Modified: python/branches/release30-maint/Include/object.h
==============================================================================

--- python/branches/release30-maint/Include/object.h	(original)
+++ python/branches/release30-maint/Include/object.h	Mon Feb 2 22:16:47 2009
@@ -274,7 +274,6 @@
 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 @@
 	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 */
