diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-07 15:30:23 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-07 15:30:23 (GMT) |
| commit | b760923b206db4f67fdfabaa5a16a5cd0bf3951e (patch) | |
| tree | 7f0152f50238f9e1f50e86852cea71a236b1384f /Mac/Python | |
| parent | 71c5b02859b56a57c6657a783b482a90c4516e33 (diff) | |
| download | cpython-b760923b206db4f67fdfabaa5a16a5cd0bf3951e.zip cpython-b760923b206db4f67fdfabaa5a16a5cd0bf3951e.tar.gz cpython-b760923b206db4f67fdfabaa5a16a5cd0bf3951e.tar.bz2 | |
Got rid of 68k-Mac and other outdated ifdefs.
Diffstat (limited to 'Mac/Python')
| -rw-r--r-- | Mac/Python/macapplication.c | 4 | ||||
| -rw-r--r-- | Mac/Python/macglue.c | 16 | ||||
| -rw-r--r-- | Mac/Python/macimport.c | 6 |
3 files changed, 0 insertions, 26 deletions
diff --git a/Mac/Python/macapplication.c b/Mac/Python/macapplication.c index 3923af2..4c71234 100644 --- a/Mac/Python/macapplication.c +++ b/Mac/Python/macapplication.c @@ -27,10 +27,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <Resources.h> #include <CodeFragments.h> -#ifdef __CFM68K__ -#pragma lib_export on -#endif - extern void PyMac_InitApplication(void); #ifdef USE_MAC_APPLET_SUPPORT extern void PyMac_InitApplet(void); diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index b81cd85..a8993f5 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -46,19 +46,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <Menus.h> #include <TextUtils.h> #include <LowMem.h> -#ifdef __CFM68K__ -/* cfm68k InterfaceLib exports GetEventQueue, but Events.h doesn't know this -** and defines it as GetEvQHdr (which is correct for PPC). This fix is for -** CW9, check that the workaround is still needed for the next release. -*/ -#define GetEvQHdr GetEventQueue -#endif /* __CFM68K__ */ - #include <Events.h> - -#ifdef __CFM68K__ -#undef GetEventQueue -#endif /* __CFM68K__ */ #else #include <Carbon/Carbon.h> #endif @@ -99,11 +87,7 @@ extern pascal unsigned char *PLstrrchr(unsigned char *, unsigned char); ** raise a MemoryError. */ #ifndef MINIMUM_STACK_SIZE -#ifdef __powerc #define MINIMUM_STACK_SIZE 8192 -#else -#define MINIMUM_STACK_SIZE 4096 -#endif #endif #if TARGET_API_MAC_CARBON diff --git a/Mac/Python/macimport.c b/Mac/Python/macimport.c index b47a694..82d6438 100644 --- a/Mac/Python/macimport.c +++ b/Mac/Python/macimport.c @@ -145,15 +145,9 @@ findnamedresource( if ( ok && dataptr != NULL ) { HLock(h); /* XXXX Unsafe if resource not correctly formatted! */ -#ifdef __CFM68K__ - /* for cfm68k we take the second pstring */ - *dataptr = *((*h)+(**h)+1); - memcpy(dataptr+1, (*h)+(**h)+2, (int)*dataptr); -#else /* for ppc we take the first pstring */ *dataptr = **h; memcpy(dataptr+1, (*h)+1, (int)*dataptr); -#endif HUnlock(h); } if ( filerh != -1 ) |