[Python-checkins] CVS: python/dist/src/Objects longobject.c,1.61,1.62

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2086/src/Objects

Modified Files:
	longobject.c 
Log Message:
Got RID of redundant coercions in longobject.c (as spotted by Greg
Stein -- thanks!).  Incidentally removed all the Py_PROTO macros
from object.h, as they prevented my editor from magically finding
the definitions of the "coercion", "cmpfunc" and "reprfunc"
typedefs that were being redundantly applied in longobject.c.


Index: longobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/longobject.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** longobject.c	2000/07/07 15:53:28	1.61
--- longobject.c	2000/07/08 00:32:04	1.62
***************
*** 1678,1683 ****
  	(binaryfunc)	long_xor,	/*nb_xor*/
  	(binaryfunc)	long_or,	/*nb_or*/
! 	(int (*) (PyObject **, PyObject **))
! 		(coercion)long_coerce,	/*nb_coerce*/
  	(unaryfunc)	long_int,	/*nb_int*/
  	(unaryfunc)	long_long,	/*nb_long*/
--- 1678,1682 ----
  	(binaryfunc)	long_xor,	/*nb_xor*/
  	(binaryfunc)	long_or,	/*nb_or*/
! 	(coercion)	long_coerce,	/*nb_coerce*/
  	(unaryfunc)	long_int,	/*nb_int*/
  	(unaryfunc)	long_long,	/*nb_long*/
***************
*** 1697,1708 ****
  	0,				/*tp_getattr*/
  	0,				/*tp_setattr*/
! 	(int (*) (PyObject *, PyObject *))
! 		(cmpfunc)long_compare,	/*tp_compare*/
  	(reprfunc)long_repr,		/*tp_repr*/
  	&long_as_number,		/*tp_as_number*/
  	0,				/*tp_as_sequence*/
  	0,				/*tp_as_mapping*/
! 	(long (*) (PyObject *))
! 		(hashfunc)long_hash,	/*tp_hash*/
          0,              		/*tp_call*/
          (reprfunc)long_str,		/*tp_str*/
--- 1696,1705 ----
  	0,				/*tp_getattr*/
  	0,				/*tp_setattr*/
! 	(cmpfunc)long_compare,		/*tp_compare*/
  	(reprfunc)long_repr,		/*tp_repr*/
  	&long_as_number,		/*tp_as_number*/
  	0,				/*tp_as_sequence*/
  	0,				/*tp_as_mapping*/
! 	(hashfunc)long_hash,		/*tp_hash*/
          0,              		/*tp_call*/
          (reprfunc)long_str,		/*tp_str*/