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/help | |
| 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/help')
| -rw-r--r-- | Mac/Modules/help/_Helpmodule.c | 10 | ||||
| -rw-r--r-- | Mac/Modules/help/helpsupport.py | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/Mac/Modules/help/_Helpmodule.c b/Mac/Modules/help/_Helpmodule.c index 66abdeb..8bd4270 100644 --- a/Mac/Modules/help/_Helpmodule.c +++ b/Mac/Modules/help/_Helpmodule.c @@ -14,20 +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 <MacHelp.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Help_Error; diff --git a/Mac/Modules/help/helpsupport.py b/Mac/Modules/help/helpsupport.py index 8d2237e..230ec0c 100644 --- a/Mac/Modules/help/helpsupport.py +++ b/Mac/Modules/help/helpsupport.py @@ -39,11 +39,7 @@ includestuff = includestuff + """ #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <MacHelp.h> -#else #include <Carbon/Carbon.h> -#endif """ class MyObjectDefinition(PEP253Mixin, GlobalObjectDefinition): |