Test for TARGET_API_MAC_CARBON with #if in stead of #ifdef.

This commit is contained in:
Jack Jansen 2000-07-14 22:37:27 +00:00
parent 2d391f2f39
commit 74a1e63a89
44 changed files with 223 additions and 223 deletions

View file

@ -154,7 +154,7 @@ static PyObject *SndCh_SndPlay(_self, _args)
return _res;
}
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *SndCh_SndStartFilePlay(_self, _args)
SndChannelObject *_self;
@ -187,7 +187,7 @@ static PyObject *SndCh_SndStartFilePlay(_self, _args)
}
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *SndCh_SndPauseFilePlay(_self, _args)
SndChannelObject *_self;
@ -205,7 +205,7 @@ static PyObject *SndCh_SndPauseFilePlay(_self, _args)
}
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *SndCh_SndStopFilePlay(_self, _args)
SndChannelObject *_self;
@ -297,17 +297,17 @@ static PyMethodDef SndCh_methods[] = {
{"SndPlay", (PyCFunction)SndCh_SndPlay, 1,
"(SndListHandle sndHandle, Boolean async) -> None"},
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"SndStartFilePlay", (PyCFunction)SndCh_SndStartFilePlay, 1,
"(short fRefNum, short resNum, long bufferSize, Boolean async) -> None"},
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"SndPauseFilePlay", (PyCFunction)SndCh_SndPauseFilePlay, 1,
"() -> None"},
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"SndStopFilePlay", (PyCFunction)SndCh_SndStopFilePlay, 1,
"(Boolean quietNow) -> None"},
#endif
@ -455,7 +455,7 @@ static int SPBObj_setattr(self, name, value)
self->ob_completion = value;
Py_INCREF(value);
rv = 1;
#ifndef TARGET_API_MAC_CARBON_NOTYET
#if !TARGET_API_MAC_CARBON_NOTYET
} else if (strcmp(name, "interruptRoutine") == 0) {
self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value;
@ -556,7 +556,7 @@ static PyObject *Snd_SndNewChannel(_self, _args)
return _res;
}
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_SndControl(_self, _args)
PyObject *_self;
@ -643,7 +643,7 @@ static PyObject *Snd_SndSetSysBeepState(_self, _args)
return _res;
}
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_MACEVersion(_self, _args)
PyObject *_self;
@ -660,7 +660,7 @@ static PyObject *Snd_MACEVersion(_self, _args)
}
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_Comp3to1(_self, _args)
PyObject *_self;
@ -707,7 +707,7 @@ static PyObject *Snd_Comp3to1(_self, _args)
}
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_Exp1to3(_self, _args)
PyObject *_self;
@ -754,7 +754,7 @@ static PyObject *Snd_Exp1to3(_self, _args)
}
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_Comp6to1(_self, _args)
PyObject *_self;
@ -801,7 +801,7 @@ static PyObject *Snd_Comp6to1(_self, _args)
}
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_Exp1to6(_self, _args)
PyObject *_self;
@ -1157,7 +1157,7 @@ static PyObject *Snd_SPBRecord(_self, _args)
return _res;
}
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
static PyObject *Snd_SPBRecordToFile(_self, _args)
PyObject *_self;
@ -1360,7 +1360,7 @@ static PyMethodDef Snd_methods[] = {
{"SndNewChannel", (PyCFunction)Snd_SndNewChannel, 1,
"(short synth, long init, PyObject* userRoutine) -> (SndChannelPtr chan)"},
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"SndControl", (PyCFunction)Snd_SndControl, 1,
"(short id) -> (SndCommand cmd)"},
#endif
@ -1373,27 +1373,27 @@ static PyMethodDef Snd_methods[] = {
{"SndSetSysBeepState", (PyCFunction)Snd_SndSetSysBeepState, 1,
"(short sysBeepState) -> None"},
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"MACEVersion", (PyCFunction)Snd_MACEVersion, 1,
"() -> (NumVersion _rv)"},
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"Comp3to1", (PyCFunction)Snd_Comp3to1, 1,
"(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"Exp1to3", (PyCFunction)Snd_Exp1to3, 1,
"(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"Comp6to1", (PyCFunction)Snd_Comp6to1, 1,
"(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
#endif
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"Exp1to6", (PyCFunction)Snd_Exp1to6, 1,
"(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
#endif
@ -1430,7 +1430,7 @@ static PyMethodDef Snd_methods[] = {
{"SPBRecord", (PyCFunction)Snd_SPBRecord, 1,
"(SPBPtr inParamPtr, Boolean asynchFlag) -> None"},
#ifndef TARGET_API_MAC_CARBON
#if !TARGET_API_MAC_CARBON
{"SPBRecordToFile", (PyCFunction)Snd_SPBRecordToFile, 1,
"(short fRefNum, SPBPtr inParamPtr, Boolean asynchFlag) -> None"},
#endif

View file

@ -64,7 +64,7 @@ class SoundScanner(Scanner):
def makegreylist(self):
return [
('#ifndef TARGET_API_MAC_CARBON', [
('#if !TARGET_API_MAC_CARBON', [
'MACEVersion',
'SPBRecordToFile',
'Exp1to6',

View file

@ -315,7 +315,7 @@ class SpbObjectDefinition(ObjectDefinition):
self->ob_completion = value;
Py_INCREF(value);
rv = 1;
#ifndef TARGET_API_MAC_CARBON_NOTYET
#if !TARGET_API_MAC_CARBON_NOTYET
} else if (strcmp(name, "interruptRoutine") == 0) {
self->ob_spb.completionRoutine = NewSIInterruptProc(SPB_interrupt);
self->ob_interrupt = value;