Merged revisions 68097,68099 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.
........
  r68099 | hirokazu.yamamoto | 2008-12-31 14:47:19 +0900 | 1 line

  Just inserted blank line.
........

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index a1b367a6d98b65204ed35b67c67389115052763e..159970267f94f110b4ef64dfbd94a169ba06273d 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -179,7 +179,7 @@ test_dict_iteration(PyObject* self)
  *   PyType_Ready if it hasn't already been called
  */
 static PyTypeObject _HashInheritanceTester_Type = {
-       PyVarObject_HEAD_INIT(&PyType_Type, 0)
+       PyVarObject_HEAD_INIT(NULL, 0)
        "hashinheritancetester",        /* Name of this type */
        sizeof(PyObject),       /* Basic object size */
        0,                      /* Item size for varobject */
@@ -1339,6 +1339,8 @@ PyInit__testcapi(void)
        if (m == NULL)
                return NULL;
 
+       Py_TYPE(&_HashInheritanceTester_Type)=&PyType_Type;
+
        Py_TYPE(&test_structmembersType)=&PyType_Type;
        Py_INCREF(&test_structmembersType);
        PyModule_AddObject(m, "test_structmembersType", (PyObject *)&test_structmembersType);