Merged revisions 68097 via svnmerge from

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

........
  r68097 | hirokazu.yamamoto | 2008-12-31 14:24:37 +0900 | 1 line

  Fixed compile error on windows.
........

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index bd2f2119e79d9b2d25ff176cec143037c2f10750..00ae1114fbb9d07a71d56af80263ed7a752f3b3f 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -177,7 +177,7 @@ test_dict_iteration(PyObject* self)
  *   PyType_Ready if it hasn't already been called
  */
 static PyTypeObject _HashInheritanceTester_Type = {
-       PyObject_HEAD_INIT(&PyType_Type)
+       PyObject_HEAD_INIT(NULL)
        0,                      /* Number of items for varobject */
        "hashinheritancetester",        /* Name of this type */
        sizeof(PyObject),       /* Basic object size */
@@ -1092,6 +1092,7 @@ init_testcapi(void)
        if (m == NULL)
                return;
 
+       Py_TYPE(&_HashInheritanceTester_Type)=&PyType_Type;
        Py_TYPE(&test_structmembersType)=&PyType_Type;
        Py_INCREF(&test_structmembersType);
        PyModule_AddObject(m, "test_structmembersType", (PyObject *)&test_structmembersType);