Include Carbon/Carbon.h in stead of universal headers, if appropriate.
Test for TARGET_API_MAC_OS8 in stead of !TARGET_API_MAC_CARBON where
appropriate.
diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index dd6c837..b4c4034 100644
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -28,11 +28,15 @@
#include "macglue.h"
#include "pythonresources.h"
+#ifdef WITHOUT_FRAMEWORKS
#include <Windows.h>
#include <Files.h>
#include <LowMem.h>
#include <Sound.h>
#include <Events.h>
+#else
+#include <Carbon/Carbon.h>
+#endif
static PyObject *MacOS_Error; /* Exception MacOS.Error */
@@ -354,13 +358,13 @@
return Py_None;
}
+#if TARGET_API_MAC_OS8
/*----------------------------------------------------------------------*/
/* STDWIN High Level Event interface */
#include <EPPC.h>
#include <Events.h>
-#if TARGET_API_MAC_OS8
static char accepthle_doc[] = "Get arguments of pending high-level event";
static PyObject *