[Python-checkins] CVS: python/dist/src/Mac/Modules/cm _Cmmodule.c,1.3,1.4

2001年11月30日 06:17:04 -0800

Update of /cvsroot/python/python/dist/src/Mac/Modules/cm
In directory usw-pr-cvs1:/tmp/cvs-serv22285/Mac/Modules/cm
Modified Files:
	_Cmmodule.c 
Log Message:
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
Index: _Cmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/_Cmmodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _Cmmodule.c	2001年09月05日 10:30:53	1.3
--- _Cmmodule.c	2001年11月30日 14:16:32	1.4
***************
*** 6,15 ****
 
 
- #ifdef _WIN32
- #include "pywintoolbox.h"
- #else
 #include "macglue.h"
 #include "pymactoolbox.h"
- #endif
 
 /* Macro to test whether a weak-loaded CFM function exists */
--- 6,11 ----
***************
*** 292,296 ****
 
 PyTypeObject ComponentInstance_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
 	0, /*ob_size*/
 	"ComponentInstance", /*tp_name*/
--- 288,292 ----
 
 PyTypeObject ComponentInstance_Type = {
! 	PyObject_HEAD_INIT(NULL)
 	0, /*ob_size*/
 	"ComponentInstance", /*tp_name*/
***************
*** 619,623 ****
 
 PyTypeObject Component_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
 	0, /*ob_size*/
 	"Component", /*tp_name*/
--- 615,619 ----
 
 PyTypeObject Component_Type = {
! 	PyObject_HEAD_INIT(NULL)
 	0, /*ob_size*/
 	"Component", /*tp_name*/