[Python-checkins] CVS: python/dist/src/Objects classobject.c,2.119,2.120

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv4246

Modified Files:
	classobject.c 
Log Message:
Rename dubiously named local variable 'cmpfunc' -- this is also a
typedef, and at least one compiler choked on this.

(SF patch #103457, by bquinlan)


Index: classobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
retrieving revision 2.119
retrieving revision 2.120
diff -C2 -r2.119 -r2.120
*** classobject.c	2001/01/29 22:38:32	2.119
--- classobject.c	2001/01/29 23:50:25	2.120
***************
*** 1410,1414 ****
  	static PyObject *cmp_obj;
  	PyObject *args;
! 	PyObject *cmpfunc;
  	PyObject *result;
  	long l;
--- 1410,1414 ----
  	static PyObject *cmp_obj;
  	PyObject *args;
! 	PyObject *cmp_func;
  	PyObject *result;
  	long l;
***************
*** 1422,1427 ****
  	}
  
! 	cmpfunc = PyObject_GetAttr(v, cmp_obj);
! 	if (cmpfunc == NULL) {
  		PyErr_Clear();
  		return 2;
--- 1422,1427 ----
  	}
  
! 	cmp_func = PyObject_GetAttr(v, cmp_obj);
! 	if (cmp_func == NULL) {
  		PyErr_Clear();
  		return 2;
***************
*** 1432,1438 ****
  		return -2;
  
! 	result = PyEval_CallObject(cmpfunc, args);
  	Py_DECREF(args);
! 	Py_DECREF(cmpfunc);
  
  	if (result == NULL)
--- 1432,1438 ----
  		return -2;
  
! 	result = PyEval_CallObject(cmp_func, args);
  	Py_DECREF(args);
! 	Py_DECREF(cmp_func);
  
  	if (result == NULL)