[Python-checkins] python/dist/src/Modules bz2module.c,1.12,1.13

2002年12月05日 12:31:56 -0800

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv20998
Modified Files:
	bz2module.c 
Log Message:
Patch #649060: Cygwin bz2module patch
This patch enables the bz2 module to build cleanly under Cygwin.
Index: bz2module.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bz2module.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** bz2module.c	23 Nov 2002 09:16:19 -0000	1.12
--- bz2module.c	5 Dec 2002 20:31:53 -0000	1.13
***************
*** 1388,1393 ****
 0, /*tp_call*/
 0, /*tp_str*/
! PyObject_GenericGetAttr,/*tp_getattro*/
! PyObject_GenericSetAttr,/*tp_setattro*/
 0, /*tp_as_buffer*/
 Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
--- 1388,1393 ----
 0, /*tp_call*/
 0, /*tp_str*/
! 0, /*tp_getattro*/
! 0, /*tp_setattro*/
 0, /*tp_as_buffer*/
 Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
***************
*** 1408,1414 ****
 0, /*tp_dictoffset*/
 (initproc)BZ2File_init, /*tp_init*/
! PyType_GenericAlloc, /*tp_alloc*/
 0, /*tp_new*/
! 	_PyObject_Del, /*tp_free*/
 0, /*tp_is_gc*/
 };
--- 1408,1414 ----
 0, /*tp_dictoffset*/
 (initproc)BZ2File_init, /*tp_init*/
! 0, /*tp_alloc*/
 0, /*tp_new*/
! 	0, /*tp_free*/
 0, /*tp_is_gc*/
 };
***************
*** 1653,1658 ****
 0, /*tp_call*/
 0, /*tp_str*/
! PyObject_GenericGetAttr,/*tp_getattro*/
! PyObject_GenericSetAttr,/*tp_setattro*/
 0, /*tp_as_buffer*/
 Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
--- 1653,1658 ----
 0, /*tp_call*/
 0, /*tp_str*/
! 0, /*tp_getattro*/
! 0, /*tp_setattro*/
 0, /*tp_as_buffer*/
 Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
***************
*** 1673,1679 ****
 0, /*tp_dictoffset*/
 (initproc)BZ2Comp_init, /*tp_init*/
! PyType_GenericAlloc, /*tp_alloc*/
! PyType_GenericNew, /*tp_new*/
! 	_PyObject_Del, /*tp_free*/
 0, /*tp_is_gc*/
 };
--- 1673,1679 ----
 0, /*tp_dictoffset*/
 (initproc)BZ2Comp_init, /*tp_init*/
! 0, /*tp_alloc*/
! 0, /*tp_new*/
! 	0, /*tp_free*/
 0, /*tp_is_gc*/
 };
***************
*** 1870,1875 ****
 0, /*tp_call*/
 0, /*tp_str*/
! PyObject_GenericGetAttr,/*tp_getattro*/
! PyObject_GenericSetAttr,/*tp_setattro*/
 0, /*tp_as_buffer*/
 Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
--- 1870,1875 ----
 0, /*tp_call*/
 0, /*tp_str*/
! 0, /*tp_getattro*/
! 0, /*tp_setattro*/
 0, /*tp_as_buffer*/
 Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
***************
*** 1890,1896 ****
 0, /*tp_dictoffset*/
 (initproc)BZ2Decomp_init, /*tp_init*/
! PyType_GenericAlloc, /*tp_alloc*/
! PyType_GenericNew, /*tp_new*/
! 	_PyObject_Del, /*tp_free*/
 0, /*tp_is_gc*/
 };
--- 1890,1896 ----
 0, /*tp_dictoffset*/
 (initproc)BZ2Decomp_init, /*tp_init*/
! 0, /*tp_alloc*/
! 0, /*tp_new*/
! 	0, /*tp_free*/
 0, /*tp_is_gc*/
 };
***************
*** 2090,2096 ****
--- 2090,2111 ----
 	BZ2File_Type.tp_base = &PyFile_Type;
 	BZ2File_Type.tp_new = PyFile_Type.tp_new;
+ 	BZ2File_Type.tp_getattro = PyObject_GenericGetAttr;
+ 	BZ2File_Type.tp_setattro = PyObject_GenericSetAttr;
+ 	BZ2File_Type.tp_alloc = PyType_GenericAlloc;
+ 	BZ2File_Type.tp_free = _PyObject_Del;
 
 	BZ2Comp_Type.ob_type = &PyType_Type;
+ 	BZ2Comp_Type.tp_getattro = PyObject_GenericGetAttr;
+ 	BZ2Comp_Type.tp_setattro = PyObject_GenericSetAttr;
+ 	BZ2Comp_Type.tp_alloc = PyType_GenericAlloc;
+ 	BZ2Comp_Type.tp_new = PyType_GenericNew;
+ 	BZ2Comp_Type.tp_free = _PyObject_Del;
+ 
 	BZ2Decomp_Type.ob_type = &PyType_Type;
+ 	BZ2Decomp_Type.tp_getattro = PyObject_GenericGetAttr;
+ 	BZ2Decomp_Type.tp_setattro = PyObject_GenericSetAttr;
+ 	BZ2Decomp_Type.tp_alloc = PyType_GenericAlloc;
+ 	BZ2Decomp_Type.tp_new = PyType_GenericNew;
+ 	BZ2Decomp_Type.tp_free = _PyObject_Del;
 
 	m = Py_InitModule3("bz2", bz2_methods, bz2__doc__);