[Python-checkins] CVS: python/dist/src/Mac/Include pymactoolbox.h,1.6,1.7

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Include
In directory usw-pr-cvs1:/tmp/cvs-serv23838/Python/Mac/Include

Modified Files:
	pymactoolbox.h 
Log Message:
Include Carbon/Carbon.h if appropriate.
Fixed glue initialization code so prototype is correct.

Index: pymactoolbox.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Include/pymactoolbox.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pymactoolbox.h	2001/05/19 12:32:39	1.6
--- pymactoolbox.h	2001/05/22 22:34:56	1.7
***************
*** 26,35 ****
  ** it sets the function pointer to point to the real function.
  */
! #define PyMac_INIT_TOOLBOX_OBJECT_NEW(rtn) { \
  	extern PyObject *(*PyMacGluePtr_##rtn)(object); \
  	PyMacGluePtr_##rtn = _##rtn; \
  }
! #define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(rtn) { \
! 	extern int (*PyMacGluePtr_##rtn)(object); \
  	PyMacGluePtr_##rtn = _##rtn; \
  }
--- 26,35 ----
  ** it sets the function pointer to point to the real function.
  */
! #define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \
  	extern PyObject *(*PyMacGluePtr_##rtn)(object); \
  	PyMacGluePtr_##rtn = _##rtn; \
  }
! #define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \
! 	extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \
  	PyMacGluePtr_##rtn = _##rtn; \
  }
***************
*** 39,44 ****
  ** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included.
  */
! #define PyMac_INIT_TOOLBOX_OBJECT_NEW(rtn)
! #define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(rtn)
  #endif /* USE_TOOLBOX_OBJECT_GLUE */
  
--- 39,44 ----
  ** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included.
  */
! #define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn)
! #define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn)
  #endif /* USE_TOOLBOX_OBJECT_GLUE */