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).
diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index e0c0ff5..6f29a20 100644
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -31,6 +31,8 @@
#include <Carbon/Carbon.h>
#endif
+#include "pymactoolbox.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -44,15 +46,11 @@
double bg_yield; /* yield at most so long when in background */
} 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 */
extern void PyMac_SetGUSISpin(void); /* Install our private GUSI spin routine */
#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 */
#ifdef USE_GUSI
@@ -97,28 +95,6 @@
StandardFileReply *reply, char *prompt); /* Ask user for file, with prompt */
#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 */