From: Hirokazu Yamamoto Date: Wed, 31 Dec 2008 06:05:46 +0000 (+0000) Subject: Merged revisions 68097,68099 via svnmerge from X-Git-Tag: v3.1a1~625 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ebab5df636b83b19fce58d15937a41b6fdb4ff9;p=python 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 a1b367a6d9..159970267f 100644 --- 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);