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/res | |
| 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/res')
| -rw-r--r-- | Mac/Modules/res/_Resmodule.c | 11 | ||||
| -rw-r--r-- | Mac/Modules/res/ressupport.py | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c index e759269..0737b19 100644 --- a/Mac/Modules/res/_Resmodule.c +++ b/Mac/Modules/res/_Resmodule.c @@ -14,21 +14,16 @@ /* 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) #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <Resources.h> -#include <string.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ResObj_New(Handle); diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py index 37cb660..91ab00a 100644 --- a/Mac/Modules/res/ressupport.py +++ b/Mac/Modules/res/ressupport.py @@ -28,12 +28,7 @@ includestuff = includestuff + """ #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <Resources.h> -#include <string.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ResObj_New(Handle); |