summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-02-04 17:03:40 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-02-04 17:03:40 (GMT)
commita5b2873aef988934fb83d36745bd5f54e65b2dca (patch)
treea0318482bc1e4049fa9b4c20063a45220cf36228
parent13cc4fd51bacc0d96068643420505f0792a74eaa (diff)
downloadcpython-a5b2873aef988934fb83d36745bd5f54e65b2dca.zip
cpython-a5b2873aef988934fb83d36745bd5f54e65b2dca.tar.gz
cpython-a5b2873aef988934fb83d36745bd5f54e65b2dca.tar.bz2
Merged revisions 77965 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r77965 | antoine.pitrou | 2010-02-04 18:02:07 +0100 (jeu., 04 févr. 2010) | 3 lines Followup to r77918: fix build under Windows. ........
-rw-r--r--Modules/_testcapimodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 3589d17..c850baf 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -302,7 +302,7 @@ static PyBufferProcs memoryviewtester_as_buffer = {
};
static PyTypeObject _MemoryViewTester_Type = {
- PyVarObject_HEAD_INIT(&PyType_Type, 0)
+ PyVarObject_HEAD_INIT(NULL, 0)
"memoryviewtester", /* Name of this type */
sizeof(PyObject), /* Basic object size */
0, /* Item size for varobject */
@@ -1831,6 +1831,7 @@ PyInit__testcapi(void)
return NULL;
Py_TYPE(&_HashInheritanceTester_Type)=&PyType_Type;
+ Py_TYPE(&_MemoryViewTester_Type)=&PyType_Type;
Py_TYPE(&test_structmembersType)=&PyType_Type;
Py_INCREF(&test_structmembersType);