Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Be more sensible about when to use TARGET_API_MAC_OS8 in stead of !TARGET_API_MAC_CARBON. This should greatly facilitate porting stuff to OSX in its MachO/BSD incarnation.

Browse source
This commit is contained in:
Jack Jansen 2001-05-12 21:31:34 +00:00
parent 1bd0a712ad
commit 6e68a7e74f
4 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mac/Modules/macosmodule.c
View file

@ -360,7 +360,7 @@ MacOS_SetCreatorAndType(PyObject *self, PyObject *args)
#include <EPPC.h>
#include <Events.h>
#if !TARGET_API_MAC_CARBON
#if TARGET_API_MAC_OS8
static char accepthle_doc[] = "Get arguments of pending high-level event";
static PyObject *
@ -704,7 +704,7 @@ MacOS_OutputSeen(PyObject *self, PyObject *args)
}
static PyMethodDef MacOS_Methods[] = {
#if !TARGET_API_MAC_CARBON
#if TARGET_API_MAC_OS8
{"AcceptHighLevelEvent", MacOS_AcceptHighLevelEvent, 1, accepthle_doc},
#endif
{"GetCreatorAndType", MacOS_GetCreatorAndType, 1, getcrtp_doc},
@ -760,10 +760,13 @@ initMacOS()
Py_BuildValue("i", PyMac_AppearanceCompliant)) != 0)
return;
#if TARGET_API_MAC_CARBON
/* Will need a different name for MachO-carbon later (macho?) */
#define PY_RUNTIMEMODEL "carbon"
#else
#elif TARGET_API_MAC_OS8
#define PY_RUNTIMEMODEL "ppc"
#elif TARGET_API_MAC_OSX
#define PY_RUNTIMEMODEL "macho"
#else
#error "None of the TARGET_API_MAC_XXX I know about is set"
#endif
if (PyDict_SetItemString(d, "runtimemodel",
Py_BuildValue("s", PY_RUNTIMEMODEL)) != 0)