[Python-checkins] CVS: python/dist/src/Objects listobject.c,2.82,2.83 object.c,2.89,2.90

[Thomas Wouters]

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

Modified Files:
	listobject.c object.c 
Log Message:

Use 'void' directly instead of the ANY #define, now that all code is ANSI C.
Leave the actual #define in for API compatibility.



Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.82
retrieving revision 2.83
diff -C2 -r2.82 -r2.83
*** listobject.c	2000/07/15 03:31:31	2.82
--- listobject.c	2000/07/25 12:56:38	2.83
***************
*** 1259,1264 ****
  		return NULL;
  	p = ((PyTupleObject *)w)->ob_item;
! 	memcpy((ANY *)p,
! 	       (ANY *)((PyListObject *)v)->ob_item,
  	       n*sizeof(PyObject *));
  	while (--n >= 0) {
--- 1259,1264 ----
  		return NULL;
  	p = ((PyTupleObject *)w)->ob_item;
! 	memcpy((void *)p,
! 	       (void *)((PyListObject *)v)->ob_item,
  	       n*sizeof(PyObject *));
  	while (--n >= 0) {

Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.89
retrieving revision 2.90
diff -C2 -r2.89 -r2.90
*** object.c	2000/07/16 12:04:31	2.89
--- object.c	2000/07/25 12:56:38	2.90
***************
*** 963,967 ****
  /* Python's malloc wrappers (see mymalloc.h) */
  
! ANY *
  PyMem_Malloc(size_t nbytes)
  {
--- 963,967 ----
  /* Python's malloc wrappers (see mymalloc.h) */
  
! void *
  PyMem_Malloc(size_t nbytes)
  {
***************
*** 973,978 ****
  }
  
! ANY *
! PyMem_Realloc(ANY *p, size_t nbytes)
  {
  #if _PyMem_EXTRA > 0
--- 973,978 ----
  }
  
! void *
! PyMem_Realloc(void *p, size_t nbytes)
  {
  #if _PyMem_EXTRA > 0
***************
*** 984,988 ****
  
  void
! PyMem_Free(ANY *p)
  {
  	PyMem_FREE(p);
--- 984,988 ----
  
  void
! PyMem_Free(void *p)
  {
  	PyMem_FREE(p);
***************
*** 992,996 ****
  /* Python's object malloc wrappers (see objimpl.h) */
  
! ANY *
  PyObject_Malloc(size_t nbytes)
  {
--- 992,996 ----
  /* Python's object malloc wrappers (see objimpl.h) */
  
! void *
  PyObject_Malloc(size_t nbytes)
  {
***************
*** 998,1003 ****
  }
  
! ANY *
! PyObject_Realloc(ANY *p, size_t nbytes)
  {
  	return PyObject_REALLOC(p, nbytes);
--- 998,1003 ----
  }
  
! void *
! PyObject_Realloc(void *p, size_t nbytes)
  {
  	return PyObject_REALLOC(p, nbytes);
***************
*** 1005,1009 ****
  
  void
! PyObject_Free(ANY *p)
  {
  	PyObject_FREE(p);
--- 1005,1009 ----
  
  void
! PyObject_Free(void *p)
  {
  	PyObject_FREE(p);