summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-10-15 19:44:24 (GMT)
committerGuido van Rossum <guido@python.org>2001-10-15 19:44:24 (GMT)
commit825d875371d091f60d2f47fea8f84d0be01e031b (patch)
treec2011ea183f2098d46f4b14460e2c80ae21050db
parent1346e83eb037ffc03c72d2fdc6da395acef9bc1b (diff)
downloadcpython-825d875371d091f60d2f47fea8f84d0be01e031b.zip
cpython-825d875371d091f60d2f47fea8f84d0be01e031b.tar.gz
cpython-825d875371d091f60d2f47fea8f84d0be01e031b.tar.bz2
Add (void *) casts to solve some problems on HP-UX 11.0, as discussed
on SF bug #467145.
-rw-r--r--Objects/typeobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 8f37229..b401abc 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3461,7 +3461,7 @@ slot_tp_getattr_hook(PyObject *self, PyObject *name)
if (getattribute != NULL &&
getattribute->ob_type == &PyWrapperDescr_Type &&
((PyWrapperDescrObject *)getattribute)->d_wrapped ==
- PyObject_GenericGetAttr)
+ (void *)PyObject_GenericGetAttr)
getattribute = NULL;
if (getattr == NULL && getattribute == NULL) {
/* Use the default dispatcher */
@@ -3700,9 +3700,9 @@ typedef struct {
#undef RBINSLOT
#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) \
- {NAME, offsetof(etype, SLOT), FUNCTION, WRAPPER}
+ {NAME, offsetof(etype, SLOT), (void *)(FUNCTION), WRAPPER}
#define SQSLOT(NAME, SLOT, FUNCTION, WRAPPER) \
ETSLOT(NAME, as_sequence.SLOT, FUNCTION, WRAPPER)
#define MPSLOT(NAME, SLOT, FUNCTION, WRAPPER) \