Mingw32 and pypy fixes (#25203) submitted by Jan de M.

8 files changed, 12 insertions, 10 deletions

diff --git a/INSTALL b/INSTALL
index 8592e2c..1d4e3fd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,7 @@ $ ./configure --prefix=<python_prefix>
 $ make
 $ make install       # may require superuser access
 
-To build from CVS, use this line instead of the configure line above:
+To build from git, use this line instead of the configure line above:
 $ ./autogen.sh --prefix=<python_prefix>
 
 If you're installing to another prefix than the one where Python is installed
@@ -31,7 +31,7 @@ $ python setup.py install
 
 Testing
 -------
-testing uses py.test from pylib
+The tests use py.test from pylib
 http://codespeak.net/py/dist/
 
 $ cd test
diff --git a/src/cairomodule.c b/src/cairomodule.c
index 21b7b20..bc95108 100644
--- a/src/cairomodule.c
+++ b/src/cairomodule.c
@@ -188,6 +188,8 @@ init_cairo(void)
   if (PyType_Ready(&PycairoPath_Type) < 0)
     return;
   PycairoPathiter_Type.tp_iter=&PyObject_SelfIter;
+  if (PyType_Ready(&PycairoPathiter_Type) < 0)
+    return;
 
   if (PyType_Ready(&PycairoPattern_Type) < 0)
     return;
diff --git a/src/context.c b/src/context.c
index e2c08b5..93b369f 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1430,7 +1430,7 @@ PyTypeObject PycairoContext_Type = {
   pycairo_methods,                    /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */
diff --git a/src/font.c b/src/font.c
index 97cf1b3..3fcc9e4 100644
--- a/src/font.c
+++ b/src/font.c
@@ -131,7 +131,7 @@ PyTypeObject PycairoFontFace_Type = {
   0,                                  /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */
@@ -410,7 +410,7 @@ PyTypeObject PycairoScaledFont_Type = {
   scaled_font_methods,                /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */
@@ -595,7 +595,7 @@ PyTypeObject PycairoFontOptions_Type = {
   font_options_methods,               /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */
diff --git a/src/matrix.c b/src/matrix.c
index eefeab9..2ec5e2d 100644
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -332,7 +332,7 @@ PyTypeObject PycairoMatrix_Type = {
   matrix_methods,                     /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */
diff --git a/src/path.c b/src/path.c
index 97ca35c..520518b 100644
--- a/src/path.c
+++ b/src/path.c
@@ -206,7 +206,7 @@ PyTypeObject PycairoPath_Type = {
   0,			        	/* tp_methods */
   0,					/* tp_members */
   0,					/* tp_getset */
-  &PyBaseObject_Type,                   /* tp_base */
+  0,                                    /* tp_base */
   0,					/* tp_dict */
   0,					/* tp_descr_get */
   0,					/* tp_descr_set */
diff --git a/src/pattern.c b/src/pattern.c
index 229e218..cebf0c9 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -194,7 +194,7 @@ PyTypeObject PycairoPattern_Type = {
   pattern_methods,                    /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */
diff --git a/src/surface.c b/src/surface.c
index 568aad7..fa11413 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -370,7 +370,7 @@ PyTypeObject PycairoSurface_Type = {
   surface_methods,                    /* tp_methods */
   0,                                  /* tp_members */
   0,                                  /* tp_getset */
-  &PyBaseObject_Type,                 /* tp_base */
+  0,                                  /* tp_base */
   0,                                  /* tp_dict */
   0,                                  /* tp_descr_get */
   0,                                  /* tp_descr_set */