[Python-checkins] CVS: python/dist/src/Mac/Modules/waste wastemodule.c,1.18,1.19

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/waste
In directory usw-pr-cvs1:/tmp/cvs-serv22285/Mac/Modules/waste

Modified Files:
	wastemodule.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: wastemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastemodule.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wastemodule.c	2001/09/05 15:42:53	1.18
--- wastemodule.c	2001/11/30 14:16:34	1.19
***************
*** 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 ----
***************
*** 349,353 ****
  
  PyTypeObject WEO_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"WEO", /*tp_name*/
--- 345,349 ----
  
  PyTypeObject WEO_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"WEO", /*tp_name*/
***************
*** 1714,1718 ****
  
  PyTypeObject waste_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"waste", /*tp_name*/
--- 1710,1714 ----
  
  PyTypeObject waste_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"waste", /*tp_name*/