summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>1996-08-19 15:11:45 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>1996-08-19 15:11:45 (GMT)
commitbf05d4cd6f320947118ee11945417a4ca97f7907 (patch)
tree106e36ec57b0c7618e80ba6e41a72dc91322e64b /Mac
parenta06f13dc78bc5e2437144219e6dd76f0033cd186 (diff)
downloadcpython-bf05d4cd6f320947118ee11945417a4ca97f7907.zip
cpython-bf05d4cd6f320947118ee11945417a4ca97f7907.tar.gz
cpython-bf05d4cd6f320947118ee11945417a4ca97f7907.tar.bz2
Fixed command-. handling
Added hacks for GetEventQueue (so you don't have to edit Events.h)
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Python/macglue.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 2c8951a..112604e 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -22,6 +22,20 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
+#ifdef __CFM68K__
+/* cfm68k InterfaceLib exports GetEventQueue, but Events.h doesn't know this
+** and defines it as GetEvQHdr (which is correct for PPC). This fix is for
+** CW9, check that the workaround is still needed for the next release.
+*/
+#define GetEvQHdr GetEventQueue
+#endif /* __CFM68K__ */
+
+#include <Events.h>
+
+#ifdef __CFM68K__
+#undef GetEventQueue
+#endif /* __CFM68K__ */
+
#include "Python.h"
#include "macglue.h"
@@ -35,7 +49,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <StandardFile.h>
#include <Resources.h>
#include <Memory.h>
-#include <Events.h>
#include <Windows.h>
#include <Desk.h>
#include <Traps.h>
@@ -402,7 +415,7 @@ PyMac_DoYield()
NGetTrapAddress(_Unimplemented, ToolTrap));
}
- if ( !PyMac_DoYieldEnabled ) {
+ if ( PyMac_DoYieldEnabled >= 0) {
#ifndef THINK_C
/* Under think this has been done before in intrcheck() or intrpeek() */
scan_event_queue(0);