Author: hirokazu.yamamoto Date: Wed Dec 31 07:05:46 2008 New Revision: 68101 Log: 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. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Modules/_testcapimodule.c Modified: python/branches/py3k/Modules/_testcapimodule.c ============================================================================== --- python/branches/py3k/Modules/_testcapimodule.c (original) +++ python/branches/py3k/Modules/_testcapimodule.c Wed Dec 31 07:05:46 2008 @@ -179,7 +179,7 @@ * 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 @@ 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);