diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-19 16:13:35 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-19 16:13:35 (GMT) |
| commit | e48cef7aba0993ca6d01579f62900f0596960885 (patch) | |
| tree | 008187dc4bba4fdd74ebca680bdef67e589527e9 /Mac/Modules/snd | |
| parent | 10d176f77e04ad95c3e501f8b65a0b9ad931a098 (diff) | |
| download | cpython-e48cef7aba0993ca6d01579f62900f0596960885.zip cpython-e48cef7aba0993ca6d01579f62900f0596960885.tar.gz cpython-e48cef7aba0993ca6d01579f62900f0596960885.tar.bz2 | |
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.
Diffstat (limited to 'Mac/Modules/snd')
| -rw-r--r-- | Mac/Modules/snd/_Sndmodule.c | 14 | ||||
| -rw-r--r-- | Mac/Modules/snd/sndsupport.py | 5 |
2 files changed, 3 insertions, 16 deletions
diff --git a/Mac/Modules/snd/_Sndmodule.c b/Mac/Modules/snd/_Sndmodule.c index 0075c98..b8f5c33 100644 --- a/Mac/Modules/snd/_Sndmodule.c +++ b/Mac/Modules/snd/_Sndmodule.c @@ -14,18 +14,13 @@ /* Macro to test whether a weak-loaded CFM function exists */ #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ - PyErr_SetString(PyExc_NotImplementedError, \ - "Not available in this shared library/OS version"); \ - return NULL; \ + PyErr_SetString(PyExc_NotImplementedError, \ + "Not available in this shared library/OS version"); \ + return NULL; \ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <Sound.h> -#include <OSUtils.h> /* for Set(Current)A5 */ -#else #include <Carbon/Carbon.h> -#endif /* Convert a SndCommand argument */ static int @@ -1150,11 +1145,8 @@ void init_Snd(void) PyModule_AddObject(m, "SndChannelType", (PyObject *)&SndChannel_Type); SPB_Type.ob_type = &PyType_Type; if (PyType_Ready(&SPB_Type) < 0) return; -#if 0 - /* This would shadow the SPB routine, which is bad news (it is important) */ Py_INCREF(&SPB_Type); PyModule_AddObject(m, "SPB", (PyObject *)&SPB_Type); -#endif /* Backward-compatible name */ Py_INCREF(&SPB_Type); PyModule_AddObject(m, "SPBType", (PyObject *)&SPB_Type); diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py index 105fc66..99df5be 100644 --- a/Mac/Modules/snd/sndsupport.py +++ b/Mac/Modules/snd/sndsupport.py @@ -17,12 +17,7 @@ class SndMethod(SndMixIn, OSErrMethodGenerator): pass # includestuff etc. are imported from macsupport includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Sound.h> -#include <OSUtils.h> /* for Set(Current)A5 */ -#else #include <Carbon/Carbon.h> -#endif """ initstuff = initstuff + """ |