From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 31 Dec 2008 05:31:10 +0000 (+0000)
Subject: Merged revisions 68097 via svnmerge from
X-Git-Tag: v2.6.2c1~303
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c00ad076004bcdcc080ce93e45ae885ba6bd0246;p=thirdparty%2FPython%2Fcpython.git

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 bd2f2119e79d..00ae1114fbb9 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);