The interruptRoutine attribute is gone under Carbon. Luckily it appears that nothing used it.

jackjansen · jackjansen · commit 319c67b6e191 · 2001-01-12T23:39:59.000Z
diff --git 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
@@ -117,7 +117,9 @@ def cleanup(self, name):
 
 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 @@ def cleanup(self, name):
 	}
 }
 
+#if !TARGET_API_MAC_CARBON
 static pascal void
 SPB_interrupt(SPBPtr my_spb)
 {
@@ -198,6 +201,7 @@ def cleanup(self, name):
 		SetA5(A5);
 	}
 }
+#endif
 """
 
 
@@ -309,7 +313,7 @@ def outputSetattrBody(self):
 		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;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ SndCmd_Convert(PyObject v, SndCommand pc)`
`37`	`37`
`38`	`38`	`static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand cmd); / Forward */`
`39`	`39`	`static pascal void SPB_completion(SPBPtr my_spb); /* Forward */`
	`40`	`+#if !TARGET_API_MAC_CARBON`
`40`	`41`	`static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */`
	`42`	`+#endif`
`41`	`43`
`42`	`44`	`static PyObject *Snd_Error;`
`43`	`45`
`@@ -449,7 +451,7 @@ static int SPBObj_setattr(self, name, value)`
`449`	`451`	`self->ob_completion = value;`
`450`	`452`	`Py_INCREF(value);`
`451`	`453`	`rv = 1;`
`452`		`-#if !TARGET_API_MAC_CARBON_NOTYET`
	`454`	`+#if !TARGET_API_MAC_CARBON`
`453`	`455`	`} else if (strcmp(name, "interruptRoutine") == 0) {`
`454`	`456`	`self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);`
`455`	`457`	`self->ob_interrupt = value;`
`@@ -1513,6 +1515,7 @@ SPB_completion(SPBPtr my_spb)`
`1513`	`1515`	`}`
`1514`	`1516`	`}`
`1515`	`1517`
	`1518`	`+#if !TARGET_API_MAC_CARBON`
`1516`	`1519`	`static pascal void`
`1517`	`1520`	`SPB_interrupt(SPBPtr my_spb)`
`1518`	`1521`	`{`
`@@ -1525,6 +1528,7 @@ SPB_interrupt(SPBPtr my_spb)`
`1525`	`1528`	`SetA5(A5);`
`1526`	`1529`	`}`
`1527`	`1530`	`}`
	`1531`	`+#endif`
`1528`	`1532`
`1529`	`1533`
`1530`	`1534`	`void initSnd()`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,9 @@ def cleanup(self, name):`
`117`	`117`
`118`	`118`	`static pascal void SndCh_UserRoutine(SndChannelPtr chan, SndCommand cmd); / Forward */`
`119`	`119`	`static pascal void SPB_completion(SPBPtr my_spb); /* Forward */`
	`120`	`+#if !TARGET_API_MAC_CARBON`
`120`	`121`	`static pascal void SPB_interrupt(SPBPtr my_spb); /* Forward */`
	`122`	`+#endif`
`121`	`123`	`"""`
`122`	`124`
`123`	`125`
`@@ -186,6 +188,7 @@ def cleanup(self, name):`
`186`	`188`	`}`
`187`	`189`	`}`
`188`	`190`
	`191`	`+#if !TARGET_API_MAC_CARBON`
`189`	`192`	`static pascal void`
`190`	`193`	`SPB_interrupt(SPBPtr my_spb)`
`191`	`194`	`{`
`@@ -198,6 +201,7 @@ def cleanup(self, name):`
`198`	`201`	`SetA5(A5);`
`199`	`202`	`}`
`200`	`203`	`}`
	`204`	`+#endif`
`201`	`205`	`"""`
`202`	`206`
`203`	`207`
`@@ -309,7 +313,7 @@ def outputSetattrBody(self):`
`309`	`313`	`self->ob_completion = value;`
`310`	`314`	`Py_INCREF(value);`
`311`	`315`	`rv = 1;`
`312`		`-#if !TARGET_API_MAC_CARBON_NOTYET`
	`316`	`+#if !TARGET_API_MAC_CARBON`
`313`	`317`	`} else if (strcmp(name, "interruptRoutine") == 0) {`
`314`	`318`	`self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);`
`315`	`319`	`self->ob_interrupt = value;`