[Python-checkins] CVS: python/dist/src/Objects classobject.c,2.89,2.90 object.c,2.72,2.73

[Guido van Rossum]

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

Modified Files:
	classobject.c object.c 
Log Message:
Trent Mick: change a few casts for Win64 compatibility.


Index: classobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
retrieving revision 2.89
retrieving revision 2.90
diff -C2 -r2.89 -r2.90
*** classobject.c	2000/06/23 19:37:01	2.89
--- classobject.c	2000/06/28 21:57:18	2.90
***************
*** 284,288 ****
  	if (v == NULL || !PyString_Check(v))
  		return "__name__ must be a string object";
! 	if ((long)strlen(PyString_AS_STRING(v)) != PyString_GET_SIZE(v))
  		return "__name__ must not contain null bytes";
  	set_slot(&c->cl_name, v);
--- 284,288 ----
  	if (v == NULL || !PyString_Check(v))
  		return "__name__ must be a string object";
! 	if (strlen(PyString_AS_STRING(v)) != (size_t)PyString_GET_SIZE(v))
  		return "__name__ must not contain null bytes";
  	set_slot(&c->cl_name, v);

Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.72
retrieving revision 2.73
diff -C2 -r2.72 -r2.73
*** object.c	2000/06/23 14:36:32	2.72
--- object.c	2000/06/28 21:57:18	2.73
***************
*** 367,371 ****
  		return NULL;
  	}
! 	if ((long)v <= (long)w) {
  		PyTuple_SET_ITEM(pair, 0, PyLong_FromVoidPtr((void *)v));
  		PyTuple_SET_ITEM(pair, 1, PyLong_FromVoidPtr((void *)w));
--- 367,371 ----
  		return NULL;
  	}
! 	if (v <= w) {
  		PyTuple_SET_ITEM(pair, 0, PyLong_FromVoidPtr((void *)v));
  		PyTuple_SET_ITEM(pair, 1, PyLong_FromVoidPtr((void *)w));