diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
| commit | fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f (patch) | |
| tree | 405f4572ec550f86d0c2c2b3a84ca672f3a70520 /Mac/Modules/scrap | |
| parent | 1129671350048d9f415d3ba3c411b9bcd8b7ae75 (diff) | |
| download | cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.zip cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.gz cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.bz2 | |
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Diffstat (limited to 'Mac/Modules/scrap')
| -rw-r--r-- | Mac/Modules/scrap/Scrapmodule.c | 4 | ||||
| -rw-r--r-- | Mac/Modules/scrap/scrapsupport.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Mac/Modules/scrap/Scrapmodule.c b/Mac/Modules/scrap/Scrapmodule.c index 436cbed..5040299 100644 --- a/Mac/Modules/scrap/Scrapmodule.c +++ b/Mac/Modules/scrap/Scrapmodule.c @@ -8,7 +8,11 @@ #include "macglue.h" #include "pymactoolbox.h" +#ifdef WITHOUT_FRAMEWORKS #include <Scrap.h> +#else +#include <Carbon/Carbon.h> +#endif /* ** Generate ScrapInfo records diff --git a/Mac/Modules/scrap/scrapsupport.py b/Mac/Modules/scrap/scrapsupport.py index 1fe9ac2..44dee33 100644 --- a/Mac/Modules/scrap/scrapsupport.py +++ b/Mac/Modules/scrap/scrapsupport.py @@ -22,7 +22,11 @@ from macsupport import * # Create the type objects includestuff = includestuff + """ -#include <%s>""" % MACHEADERFILE + """ +#ifdef WITHOUT_FRAMEWORKS +#include <Scrap.h> +#else +#include <Carbon/Carbon.h> +#endif /* ** Generate ScrapInfo records |