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.
diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index b9a56ef..d5f283b 100644
--- a/Mac/Modules/macmodule.c
+++ b/Mac/Modules/macmodule.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <errno.h>
-#if !TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_OS8
/* Skip for Carbon */
#include "macstat.h"
#endif
@@ -51,7 +51,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#else /* USE_GUSI */
-#if !TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_OS8
#define stat macstat
#endif
#endif /* USE_GUSI */
@@ -259,7 +259,7 @@
}
#endif
-#if !TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_OS8
static PyObject *
mac_getbootvol(self, args)
PyObject *self;
@@ -499,7 +499,7 @@
}
#endif /* WEHAVE_FSTAT */
-#if !TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_OS8
static PyObject *
mac_xstat(self, args)
PyObject *self;
@@ -611,7 +611,7 @@
#ifdef WEHAVE_FSTAT
{"fstat", mac_fstat},
#endif
-#if !TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_OS8
{"getbootvol", mac_getbootvol}, /* non-standard */
#endif
{"getcwd", mac_getcwd},
@@ -623,7 +623,7 @@
{"rename", mac_rename},
{"rmdir", mac_rmdir},
{"stat", mac_stat},
-#if !TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_OS8
{"xstat", mac_xstat},
#endif
{"sync", mac_sync},
diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 6fe0bd0..dd6c837 100644
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -360,7 +360,7 @@
#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 @@
}
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 @@
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)