Merged revisions 62013-62014 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62013 | amaury.forgeotdarc | 2008-03-28 21:17:51 +0100 (Fr, 28 Mär 2008) | 2 lines

  Silence a compilation warning
........
  r62014 | georg.brandl | 2008-03-28 21:22:56 +0100 (Fr, 28 Mär 2008) | 2 lines

  Silence compiler warning at the source.
........

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 496ad01ebb020ebb7f79129924e9e789872bbbf0..94e04b1c02124381643a7d2db5134f21688ee707 100755 (executable)
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -938,7 +938,7 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena)
 {
     mod_ty res;
     init_types();
-    if (!PyObject_IsInstance(ast, mod_type)) {
+    if (!PyObject_IsInstance(ast, (PyObject*)mod_type)) {
         PyErr_SetString(PyExc_TypeError, "expected either Module, Interactive "
                         "or Expression node");
         return NULL;

diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index e89c9d57e8c1a92ca7f9eee6ea68bf2368f1c2bd..464d28d34b1146ec3d2e1a6ae69a6a1205585a18 100644 (file)
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -6419,7 +6419,7 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena)
 {
     mod_ty res;
     init_types();
-    if (!PyObject_IsInstance(ast, mod_type)) {
+    if (!PyObject_IsInstance(ast, (PyObject*)mod_type)) {
         PyErr_SetString(PyExc_TypeError, "expected either Module, Interactive "
                         "or Expression node");
         return NULL;