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

Jack Jansen jackjansen@users.sourceforge.net
Fri, 30 Nov 2001 06:17:04 -0800


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

Modified Files:
	_Dragmodule.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: _Dragmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/drag/_Dragmodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _Dragmodule.c	2001/09/05 10:30:39	1.3
--- _Dragmodule.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 ----
***************
*** 676,680 ****
  
  PyTypeObject DragObj_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"DragObj", /*tp_name*/
--- 672,676 ----
  
  PyTypeObject DragObj_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"DragObj", /*tp_name*/