diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-20 13:31:00 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-20 13:31:00 (GMT) |
| commit | 7107c1aff301a65faed24642cdc08f82a1c41cd4 (patch) | |
| tree | 1ce55f300f09be769722831564e22a9f49bbefa5 /Mac/Modules/waste | |
| parent | 3305d2487d76a8a24448d825e98f8afb4caa76ab (diff) | |
| download | cpython-7107c1aff301a65faed24642cdc08f82a1c41cd4.zip cpython-7107c1aff301a65faed24642cdc08f82a1c41cd4.tar.gz cpython-7107c1aff301a65faed24642cdc08f82a1c41cd4.tar.bz2 | |
Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.
Diffstat (limited to 'Mac/Modules/waste')
| -rw-r--r-- | Mac/Modules/waste/wastemodule.c | 14 | ||||
| -rw-r--r-- | Mac/Modules/waste/wastescan.py | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c index f05e467..53aff83 100644 --- a/Mac/Modules/waste/wastemodule.c +++ b/Mac/Modules/waste/wastemodule.c @@ -5,27 +5,19 @@ -#ifdef _WIN32 -#include "pywintoolbox.h" -#else -#include "macglue.h" #include "pymactoolbox.h" -#endif /* 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) #include <WASTE.h> #include <WEObjectHandlers.h> #include <WETabs.h> -#ifndef PyDoc_STR -#define PyDoc_STR(x) (x) -#endif /* Exported by Qdmodule.c: */ extern PyObject *QdRGB_New(RGBColor *); diff --git a/Mac/Modules/waste/wastescan.py b/Mac/Modules/waste/wastescan.py index 1d7bdcb..8298f26 100644 --- a/Mac/Modules/waste/wastescan.py +++ b/Mac/Modules/waste/wastescan.py @@ -6,7 +6,7 @@ from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -WASTEDIR='/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/MacOS Support/(Third Party Support)/Waste 2.0 Distribution/C_C++ Headers/' +WASTEDIR='/Users/jack/src/waste/C_C++ Headers/' if not os.path.exists(WASTEDIR): raise 'Error: not found: %s', WASTEDIR |