mirror of
https://github.com/python/cpython.git
synced 2025-11-11 14:44:57 +00:00
Add (void *) casts to solve some problems on HP-UX 11.0, as discussed
on SF bug #467145.
This commit is contained in:
parent
1346e83eb0
commit
825d875371
1 changed files with 3 additions and 3 deletions
|
|
@ -3461,7 +3461,7 @@ slot_tp_getattr_hook(PyObject *self, PyObject *name)
|
||||||
if (getattribute != NULL &&
|
if (getattribute != NULL &&
|
||||||
getattribute->ob_type == &PyWrapperDescr_Type &&
|
getattribute->ob_type == &PyWrapperDescr_Type &&
|
||||||
((PyWrapperDescrObject *)getattribute)->d_wrapped ==
|
((PyWrapperDescrObject *)getattribute)->d_wrapped ==
|
||||||
PyObject_GenericGetAttr)
|
(void *)PyObject_GenericGetAttr)
|
||||||
getattribute = NULL;
|
getattribute = NULL;
|
||||||
if (getattr == NULL && getattribute == NULL) {
|
if (getattr == NULL && getattribute == NULL) {
|
||||||
/* Use the default dispatcher */
|
/* Use the default dispatcher */
|
||||||
|
|
@ -3700,9 +3700,9 @@ typedef struct {
|
||||||
#undef RBINSLOT
|
#undef RBINSLOT
|
||||||
|
|
||||||
#define TPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
#define TPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
||||||
{NAME, offsetof(PyTypeObject, SLOT), FUNCTION, WRAPPER}
|
{NAME, offsetof(PyTypeObject, SLOT), (void *)(FUNCTION), WRAPPER}
|
||||||
#define ETSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
#define ETSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
||||||
{NAME, offsetof(etype, SLOT), FUNCTION, WRAPPER}
|
{NAME, offsetof(etype, SLOT), (void *)(FUNCTION), WRAPPER}
|
||||||
#define SQSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
#define SQSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
||||||
ETSLOT(NAME, as_sequence.SLOT, FUNCTION, WRAPPER)
|
ETSLOT(NAME, as_sequence.SLOT, FUNCTION, WRAPPER)
|
||||||
#define MPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
#define MPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue