From f249addeed730cd669fc9dde579e8f63e44e9c5d Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Tue, 7 Aug 2001 15:32:37 +0000 Subject: Got rid of (hopefully) the last 68k-mac related ifdefs. --- Include/pyport.h | 62 ------------------------------------------------------ Modules/_tkinter.c | 7 ------ 2 files changed, 69 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h index c589ecd..35d8713 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -273,70 +273,8 @@ extern int fsync(int fd); * WRAPPER FOR * ************************/ -/* On the 68K Mac, when using CFM (Code Fragment Manager), - requires special treatment -- we need to surround it with - #pragma lib_export off / on... - This is because MathLib.o is a static library, and exporting its - symbols doesn't quite work... - XXX Not sure now... Seems to be something else going on as well... */ - #ifndef HAVE_HYPOT extern double hypot(double, double); -#ifdef MWERKS_BEFORE_PRO4 -#define hypot we_dont_want_faulty_hypot_decl -#endif -#endif - -#ifndef HAVE_HYPOT -#ifdef __MWERKS__ -#undef hypot -#endif -#endif - -#if defined(USE_MSL) && defined(__MC68K__) -/* CodeWarrior MSL 2.1.1 has weird define overrides that don't work -** when you take the address of math functions. If I interpret the -** ANSI C standard correctly this is illegal, but I haven't been able -** to convince the MetroWerks folks of this... -*/ -#undef acos -#undef asin -#undef atan -#undef atan2 -#undef ceil -#undef cos -#undef cosh -#undef exp -#undef fabs -#undef floor -#undef fmod -#undef log -#undef log10 -#undef pow -#undef sin -#undef sinh -#undef sqrt -#undef tan -#undef tanh -#define acos acosd -#define asin asind -#define atan atand -#define atan2 atan2d -#define ceil ceild -#define cos cosd -#define cosh coshd -#define exp expd -#define fabs fabsd -#define floor floord -#define fmod fmodd -#define log logd -#define log10 log10d -#define pow powd -#define sin sind -#define sinh sinhd -#define sqrt sqrtd -#define tan tand -#define tanh tanhd #endif diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index f20a1ef..9b73307 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -183,16 +183,9 @@ int TkMacConvertEvent(EventRecord *eventPtr); staticforward int PyMacConvertEvent(EventRecord *eventPtr); -#if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) - #pragma import on -#endif - #include extern int SIOUXIsAppWindow(WindowPtr); -#if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) - #pragma import reset -#endif #endif /* macintosh */ #ifndef FREECAST -- cgit v0.12