Another directory quickly renamed.
diff --git a/Parser/intrcheck.c b/Parser/intrcheck.c
index 40f335e..685e066 100644
--- a/Parser/intrcheck.c
+++ b/Parser/intrcheck.c
@@ -45,12 +45,12 @@
#include <io.h>
void
-initintr()
+PyOS_InitInterrupts()
{
}
int
-intrcheck()
+PyOS_InterruptOccurred()
{
_wyield();
}
@@ -76,13 +76,13 @@
#include <go32.h>
void
-initintr()
+PyOS_InitInterrupts()
{
_go32_want_ctrl_break(1 /* TRUE */);
}
int
-intrcheck()
+PyOS_InterruptOccurred()
{
return _go32_was_ctrl_break_hit();
}
@@ -92,12 +92,12 @@
/* This might work for MS-DOS (untested though): */
void
-initintr()
+PyOS_InitInterrupts()
{
}
int
-intrcheck()
+PyOS_InterruptOccurred()
{
int interrupted = 0;
while (kbhit()) {
@@ -141,7 +141,7 @@
interrupted = 1;
}
-extern int sigcheck();
+extern int PyErr_CheckSignals();
/* ARGSUSED */
static RETSIGTYPE
@@ -152,7 +152,7 @@
int sig; /* Not used by required by interface */
#endif /* _M_IX86 */
{
- extern void goaway PROTO((int));
+ extern void Py_Exit Py_PROTO((int));
static char message[] =
"python: to interrupt a truly hanging Python program, interrupt once more.\n";
switch (interrupted++) {
@@ -163,15 +163,15 @@
break;
case 2:
interrupted = 0;
- goaway(1);
+ Py_Exit(1);
break;
}
signal(SIGINT, intcatcher);
- Py_AddPendingCall(sigcheck, NULL);
+ Py_AddPendingCall(PyErr_CheckSignals, NULL);
}
void
-initintr()
+PyOS_InitInterrupts()
{
if (signal(SIGINT, SIG_IGN) != SIG_IGN)
signal(SIGINT, intcatcher);
@@ -187,7 +187,7 @@
}
int
-intrcheck()
+PyOS_InterruptOccurred()
{
if (!interrupted)
return 0;