summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-01-12 23:39:59 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-01-12 23:39:59 (GMT)
commit319c67b6e19188ded26180a547778a08043c4875 (patch)
tree13daa09c8bcaabfed74aaad7faf0cd4ab614416f /Mac
parent736b51df7c0ce09e2944976d75929696126cac72 (diff)
downloadcpython-319c67b6e19188ded26180a547778a08043c4875.zip
cpython-319c67b6e19188ded26180a547778a08043c4875.tar.gz
cpython-319c67b6e19188ded26180a547778a08043c4875.tar.bz2
The interruptRoutine attribute is gone under Carbon. Luckily it appears that nothing used it.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Modules/snd/Sndmodule.c6
-rw-r--r--Mac/Modules/snd/sndsupport.py6
2 files changed, 10 insertions, 2 deletions
diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c
index e0a80c3..bb1f7df 100644
--- a/Mac/Modules/snd/Sndmodule.c
+++ b/Mac/Modules/snd/Sndmodule.c
@@ -37,7 +37,9 @@ SndCmd_Convert(PyObject *v, SndCommand *pc)
static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand *cmd); /* Forward */
static pascal void SPB_completion(SPBPtr my_spb); /* Forward */
+#if !TARGET_API_MAC_CARBON
static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */
+#endif
static PyObject *Snd_Error;
@@ -449,7 +451,7 @@ static int SPBObj_setattr(self, name, value)
self->ob_completion = value;
Py_INCREF(value);
rv = 1;
-#if !TARGET_API_MAC_CARBON_NOTYET
+#if !TARGET_API_MAC_CARBON
} else if (strcmp(name, "interruptRoutine") == 0) {
self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value;
@@ -1513,6 +1515,7 @@ SPB_completion(SPBPtr my_spb)
}
}
+#if !TARGET_API_MAC_CARBON
static pascal void
SPB_interrupt(SPBPtr my_spb)
{
@@ -1525,6 +1528,7 @@ SPB_interrupt(SPBPtr my_spb)
SetA5(A5);
}
}
+#endif
void initSnd()
diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index 730e381..89b3657 100644
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -117,7 +117,9 @@ SndCmd_Convert(PyObject *v, SndCommand *pc)
static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand *cmd); /* Forward */
static pascal void SPB_completion(SPBPtr my_spb); /* Forward */
+#if !TARGET_API_MAC_CARBON
static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */
+#endif
"""
@@ -186,6 +188,7 @@ SPB_completion(SPBPtr my_spb)
}
}
+#if !TARGET_API_MAC_CARBON
static pascal void
SPB_interrupt(SPBPtr my_spb)
{
@@ -198,6 +201,7 @@ SPB_interrupt(SPBPtr my_spb)
SetA5(A5);
}
}
+#endif
"""
@@ -309,7 +313,7 @@ class SpbObjectDefinition(ObjectDefinition):
self->ob_completion = value;
Py_INCREF(value);
rv = 1;
-#if !TARGET_API_MAC_CARBON_NOTYET
+#if !TARGET_API_MAC_CARBON
} else if (strcmp(name, "interruptRoutine") == 0) {
self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value;