[Python-checkins] CVS: python/dist/src/Objects typeobject.c,2.102,2.103

[Guido van Rossum]

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

Modified Files:
	typeobject.c 
Log Message:
Add (void *) casts to solve some problems on HP-UX 11.0, as discussed
on SF bug #467145.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.102
retrieving revision 2.103
diff -C2 -d -r2.102 -r2.103
*** typeobject.c	2001/10/13 20:02:41	2.102
--- typeobject.c	2001/10/15 19:44:24	2.103
***************
*** 3462,3466 ****
  	    getattribute->ob_type == &PyWrapperDescr_Type &&
  	    ((PyWrapperDescrObject *)getattribute)->d_wrapped ==
! 	    PyObject_GenericGetAttr)
  		    getattribute = NULL;
  	if (getattr == NULL && getattribute == NULL) {
--- 3462,3466 ----
  	    getattribute->ob_type == &PyWrapperDescr_Type &&
  	    ((PyWrapperDescrObject *)getattribute)->d_wrapped ==
! 	    (void *)PyObject_GenericGetAttr)
  		    getattribute = NULL;
  	if (getattr == NULL && getattribute == NULL) {
***************
*** 3701,3707 ****
  
  #define TPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
! 	{NAME, offsetof(PyTypeObject, SLOT), FUNCTION, WRAPPER}
  #define ETSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
! 	{NAME, offsetof(etype, SLOT), FUNCTION, WRAPPER}
  #define SQSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
  	ETSLOT(NAME, as_sequence.SLOT, FUNCTION, WRAPPER)
--- 3701,3707 ----
  
  #define TPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
! 	{NAME, offsetof(PyTypeObject, SLOT), (void *)(FUNCTION), WRAPPER}
  #define ETSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
! 	{NAME, offsetof(etype, SLOT), (void *)(FUNCTION), WRAPPER}
  #define SQSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
  	ETSLOT(NAME, as_sequence.SLOT, FUNCTION, WRAPPER)