bpo-36027 bpo-36974: Fix "incompatible pointer type" compiler warnings (GH-13758)

encukou · web-flow · commit e584cbff1ea7 · 2019-06-03T01:08:14.000+02:00
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -5854,7 +5854,7 @@ MethodDescriptor_vectorcall(PyObject *callable, PyObject *const *args,
 static PyObject *
 MethodDescriptor_new(PyTypeObject* type, PyObject* args, PyObject *kw)
 {
-    MethodDescriptorObject *op = type->tp_alloc(type, 0);
+    MethodDescriptorObject *op = (MethodDescriptorObject *)type->tp_alloc(type, 0);
     op->vectorcall = MethodDescriptor_vectorcall;
     return (PyObject *)op;
 }
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -4243,7 +4243,7 @@ long_invmod(PyLongObject *a, PyLongObject *n)
 
     Py_DECREF(c);
     Py_DECREF(n);
-    if (long_compare(a, _PyLong_One)) {
+    if (long_compare(a, (PyObject *)_PyLong_One)) {
         /* a != 1; we don't have an inverse. */
         Py_DECREF(a);
         Py_DECREF(b);

Original file line number	Diff line number	Diff line change
`@@ -5854,7 +5854,7 @@ MethodDescriptor_vectorcall(PyObject callable, PyObject const *args,`
`5854`	`5854`	`static PyObject *`
`5855`	`5855`	`MethodDescriptor_new(PyTypeObject* type, PyObject* args, PyObject *kw)`
`5856`	`5856`	`{`
`5857`		`- MethodDescriptorObject *op = type->tp_alloc(type, 0);`
	`5857`	`+ MethodDescriptorObject op = (MethodDescriptorObject )type->tp_alloc(type, 0);`
`5858`	`5858`	`op->vectorcall = MethodDescriptor_vectorcall;`
`5859`	`5859`	`return (PyObject *)op;`
`5860`	`5860`	`}`