diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-12-31 05:31:10 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-12-31 05:31:10 (GMT) |
| commit | c00ad076004bcdcc080ce93e45ae885ba6bd0246 (patch) | |
| tree | 3a9ef8da0662e9b20bc84c2c6f32af7f09c876f9 /Modules | |
| parent | d263bd8d4a2f6dbe30b8562eed1521562a370ce0 (diff) | |
| download | cpython-c00ad076004bcdcc080ce93e45ae885ba6bd0246.zip cpython-c00ad076004bcdcc080ce93e45ae885ba6bd0246.tar.gz cpython-c00ad076004bcdcc080ce93e45ae885ba6bd0246.tar.bz2 | |
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.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_testcapimodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index bd2f211..00ae111 100644 --- 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); |