[Python-checkins] CVS: python/dist/src/Mac/Modules/cm Cmmodule.c,1.12,1.13

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/cm
In directory usw-pr-cvs1:/tmp/cvs-serv7552/Python/Mac/Modules/cm

Modified Files:
	Cmmodule.c 
Log Message:
First step in porting MacPython modules to OSX/unix: break all references between modules except for the obj_New() and obj_Convert() routines, the PyArg_Parse and Py_BuildValue helpers. 

And these can now be vectored through glue routines (by defining USE_TOOLBOX_OBJECT_GLUE) which will do the necessary imports, whereupon the module's init routine will tell the glue routine about the real conversion routine address and everything is fine again.

Index: Cmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/Cmmodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Cmmodule.c	2000/12/10 23:43:30	1.12
--- Cmmodule.c	2001/05/17 21:54:29	1.13
***************
*** 10,13 ****
--- 10,24 ----
  
  #include <Components.h>
+ #ifdef USE_TOOLBOX_OBJECT_GLUE
+ extern PyObject *_CmpObj_New(Component);
+ extern int _CmpObj_Convert(PyObject *, Component *);
+ extern PyObject *_CmpInstObj_New(ComponentInstance);
+ extern int _CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ #define CmpObj_New _CmpObj_New
+ #define CmpObj_Convert _CmpObj_Convert
+ #define CmpInstObj_New _CmpInstObj_New
+ #define CmpInstObj_Convert _CmpInstObj_Convert
+ #endif
  
  /*
***************
*** 825,828 ****
--- 836,844 ----
  
  
+ 
+ 		PyMac_INIT_TOOLBOX_OBJECT_NEW(CmpObj_New);
+ 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(CmpObj_Convert);
+ 		PyMac_INIT_TOOLBOX_OBJECT_NEW(CmpInstObj_New);
+ 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(CmpInstObj_Convert);