[Python-checkins] CVS: python/dist/src/Mac/Include macglue.h,1.55,1.56 pymactoolbox.h,1.8,NONE

[Jack Jansen]

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

Modified Files:
	macglue.h 
Removed Files:
	pymactoolbox.h 
Log Message:
Split macglue.c into two: a new mactoolboxglue.c (in ./Python)
with functionality needed for both unix-Python and MacPython and a
new smaller ./Mac/Python/macglue.c which contains MacPython stuff only.

pymactoolbox.h has moved to ./Include from ./Mac/Include and now also
contains the relevant stuff from macglue.h.

The net effect of this is that the ./Mac subdirectory is not needed
anymore for building the unix-Python core on MacOSX (it is needed
for building the extension modules).


Index: macglue.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Include/macglue.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** macglue.h	2001/07/08 22:07:18	1.55
--- macglue.h	2001/08/08 13:17:31	1.56
***************
*** 32,35 ****
--- 32,37 ----
  #endif
  
+ #include "pymactoolbox.h"
+ 
  #ifdef __cplusplus
  	extern "C" {
***************
*** 45,49 ****
  } PyMacSchedParams;
  
- char *PyMac_getscript(void);	/* Get the default encoding for our 8bit character set */
  #ifdef USE_GUSI1
  void PyMac_FixGUSIcd(void);		/* Workaround for GUSI chdir() call */
--- 47,50 ----
***************
*** 51,57 ****
  #endif
  
- char *PyMac_StrError(int);			/* strerror with mac errors */
- PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
- PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
  unsigned char *Pstring(char *str);		/* Convert c-string to pascal-string in static buffer */
  
--- 52,55 ----
***************
*** 98,123 ****
  #endif /* TARGET_API_MAC_OS8 */
  
- int PyMac_GetOSType(PyObject *, OSType *);	/* argument parser for OSType */
- PyObject *PyMac_BuildOSType(OSType);		/* Convert OSType to PyObject */
- 
- PyObject *PyMac_BuildNumVersion(NumVersion);	/* Convert NumVersion to PyObject */
- 
- int PyMac_GetStr255(PyObject *, Str255);	/* argument parser for Str255 */
- PyObject *PyMac_BuildStr255(Str255);		/* Convert Str255 to PyObject */
- PyObject *PyMac_BuildOptStr255(Str255);		/* Convert Str255 to PyObject, NULL to None */
- 
- int PyMac_GetRect(PyObject *, Rect *);		/* argument parser for Rect */
- PyObject *PyMac_BuildRect(Rect *);		/* Convert Rect to PyObject */
- 
- int PyMac_GetPoint(PyObject *, Point *);	/* argument parser for Point */
- PyObject *PyMac_BuildPoint(Point);		/* Convert Point to PyObject */
- 
- int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for EventRecord */
- PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to PyObject */
- 
- int PyMac_GetFixed(PyObject *, Fixed *);	/* argument parser for Fixed */
- PyObject *PyMac_BuildFixed(Fixed);			/* Convert Fixed to PyObject */
- int PyMac_Getwide(PyObject *, wide *);	/* argument parser for wide */
- PyObject *PyMac_Buildwide(wide *);			/* Convert wide to PyObject */
  void PyMac_InitApplet(void);			/* Initialize and run an Applet */
  void PyMac_Initialize(void);			/* Initialize function for embedding Python */
--- 96,99 ----

--- pymactoolbox.h DELETED ---