[Python-checkins] CVS: python/dist/src/Mac/Modules/qd _Qdmodule.c,1.4,1.5

[Jack Jansen]

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

Modified Files:
	_Qdmodule.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: _Qdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qd/_Qdmodule.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _Qdmodule.c	2001/09/05 15:43:33	1.4
--- _Qdmodule.c	2001/11/30 14:16:33	1.5
***************
*** 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 ----
***************
*** 374,378 ****
  
  PyTypeObject GrafPort_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"GrafPort", /*tp_name*/
--- 370,374 ----
  
  PyTypeObject GrafPort_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"GrafPort", /*tp_name*/
***************
*** 505,509 ****
  
  PyTypeObject BitMap_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"BitMap", /*tp_name*/
--- 501,505 ----
  
  PyTypeObject BitMap_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"BitMap", /*tp_name*/
***************
*** 633,637 ****
  
  staticforward PyTypeObject QDGlobalsAccess_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"QDGlobalsAccess", /*tp_name*/
--- 629,633 ----
  
  staticforward PyTypeObject QDGlobalsAccess_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"QDGlobalsAccess", /*tp_name*/