From a44923fbfe9c48f04dce9e8e111e9b898f60d14b Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Fri, 14 Jul 2000 22:52:50 +0000 Subject: Got rid of obsolete HAVE_UNIVERSAL_HEADERS test and SystemSevenOrLater define. --- Mac/Include/macglue.h | 8 -------- Mac/Modules/ae/AEmodule.c | 22 ---------------------- Mac/Modules/ae/aesupport.py | 22 ---------------------- Mac/Modules/ctbmodule.c | 6 ------ Mac/Modules/dlg/Dlgmodule.c | 4 ---- Mac/Modules/dlg/dlgsupport.py | 4 ---- Mac/Modules/scrap/Scrapmodule.c | 5 ----- Mac/Modules/snd/Sndmodule.c | 6 ------ Mac/Modules/snd/sndsupport.py | 6 ------ 9 files changed, 83 deletions(-) diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h index fc014d5..e7e6438 100644 --- a/Mac/Include/macglue.h +++ b/Mac/Include/macglue.h @@ -22,10 +22,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifndef SystemSevenOrLater -#define SystemSevenOrLater 1 -#endif - #include #include #include @@ -45,10 +41,6 @@ typedef struct { } PyMacSchedParams; -#ifdef GENERATINGCFM /* Defined to 0 or 1 in Universal headers */ -#define HAVE_UNIVERSAL_HEADERS -#endif - #ifdef USE_GUSI1 void PyMac_FixGUSIcd(void); /* Workaround for GUSI chdir() call */ extern void PyMac_SetGUSISpin(void); /* Install our private GUSI spin routine */ diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c index 435560a..ab07544 100644 --- a/Mac/Modules/ae/AEmodule.c +++ b/Mac/Modules/ae/AEmodule.c @@ -10,28 +10,6 @@ #include -#ifndef HAVE_UNIVERSAL_HEADERS -#define AEIdleProcPtr IdleProcPtr -#define AEFilterProcPtr EventFilterProcPtr -#define AEEventHandlerProcPtr EventHandlerProcPtr -#endif - -#ifndef HAVE_UNIVERSAL_HEADERS -/* I'm trying to setup the code here so that is easily automated, -** as follows: -** - Use the UPP in the source -** - for pre-universal headers, #define each UPP as the corresponding ProcPtr -** - for each routine we pass we declare a upp_xxx that -** we initialize to the correct value in the init routine. -*/ -#define AEIdleUPP AEIdleProcPtr -#define AEFilterUPP AEFilterProcPtr -#define AEEventHandlerUPP AEEventHandlerProcPtr -#define NewAEIdleProc(x) (x) -#define NewAEFilterProc(x) (x) -#define NewAEEventHandlerProc(x) (x) -#endif - static pascal OSErr GenericEventHandler(); /* Forward */ AEEventHandlerUPP upp_GenericEventHandler; diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py index 9423312..9931f9d 100644 --- a/Mac/Modules/ae/aesupport.py +++ b/Mac/Modules/ae/aesupport.py @@ -84,28 +84,6 @@ AEMethod = OSErrMethodGenerator includestuff = includestuff + """ #include -#ifndef HAVE_UNIVERSAL_HEADERS -#define AEIdleProcPtr IdleProcPtr -#define AEFilterProcPtr EventFilterProcPtr -#define AEEventHandlerProcPtr EventHandlerProcPtr -#endif - -#ifndef HAVE_UNIVERSAL_HEADERS -/* I'm trying to setup the code here so that is easily automated, -** as follows: -** - Use the UPP in the source -** - for pre-universal headers, #define each UPP as the corresponding ProcPtr -** - for each routine we pass we declare a upp_xxx that -** we initialize to the correct value in the init routine. -*/ -#define AEIdleUPP AEIdleProcPtr -#define AEFilterUPP AEFilterProcPtr -#define AEEventHandlerUPP AEEventHandlerProcPtr -#define NewAEIdleProc(x) (x) -#define NewAEFilterProc(x) (x) -#define NewAEEventHandlerProc(x) (x) -#endif - static pascal OSErr GenericEventHandler(); /* Forward */ AEEventHandlerUPP upp_GenericEventHandler; diff --git a/Mac/Modules/ctbmodule.c b/Mac/Modules/ctbmodule.c index d95cc99..dea35b7 100644 --- a/Mac/Modules/ctbmodule.c +++ b/Mac/Modules/ctbmodule.c @@ -36,12 +36,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include -#ifndef HAVE_UNIVERSAL_HEADERS -#define ConnectionCompletionUPP ProcPtr -#define ConnectionChooseIdleUPP ProcPtr -#define NewConnectionCompletionProc(x) (x) -#define NewConnectionChooseIdleProc(x) (x) -#endif #define _UnimplementedToolTrap 0xA89F #define _CommToolboxTrap 0x8B diff --git a/Mac/Modules/dlg/Dlgmodule.c b/Mac/Modules/dlg/Dlgmodule.c index 827f7eb..33ce390 100644 --- a/Mac/Modules/dlg/Dlgmodule.c +++ b/Mac/Modules/dlg/Dlgmodule.c @@ -10,10 +10,6 @@ #include -#ifndef HAVE_UNIVERSAL_HEADERS -#define NewModalFilterProc(x) (x) -#endif - /* XXX Shouldn't this be a stack? */ static PyObject *Dlg_FilterProc_callback = NULL; diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py index f5b86f5..bcf82ff 100644 --- a/Mac/Modules/dlg/dlgsupport.py +++ b/Mac/Modules/dlg/dlgsupport.py @@ -31,10 +31,6 @@ EventMask = Type("EventMask", "H") includestuff = includestuff + """ #include -#ifndef HAVE_UNIVERSAL_HEADERS -#define NewModalFilterProc(x) (x) -#endif - /* XXX Shouldn't this be a stack? */ static PyObject *Dlg_FilterProc_callback = NULL; diff --git a/Mac/Modules/scrap/Scrapmodule.c b/Mac/Modules/scrap/Scrapmodule.c index 5dd5c5a..4dfb4cd 100644 --- a/Mac/Modules/scrap/Scrapmodule.c +++ b/Mac/Modules/scrap/Scrapmodule.c @@ -2,11 +2,6 @@ /* ========================== Module Scrap ========================== */ #include "Python.h" - - - -#define SystemSevenOrLater 1 - #include "macglue.h" #include #include diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c index d230c2b..daa0090 100644 --- a/Mac/Modules/snd/Sndmodule.c +++ b/Mac/Modules/snd/Sndmodule.c @@ -10,12 +10,6 @@ #include -#ifndef HAVE_UNIVERSAL_HEADERS -#define SndCallBackUPP ProcPtr -#define NewSndCallBackProc(x) ((SndCallBackProcPtr)(x)) -#define SndListHandle Handle -#endif - #include /* for Set(Current)A5 */ /* Create a SndCommand object (an (int, int, int) tuple) */ diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py index 1f2fdea..730e381 100644 --- a/Mac/Modules/snd/sndsupport.py +++ b/Mac/Modules/snd/sndsupport.py @@ -18,12 +18,6 @@ class SndMethod(SndMixIn, OSErrMethodGenerator): pass includestuff = includestuff + """ #include - -#ifndef HAVE_UNIVERSAL_HEADERS -#define SndCallBackUPP ProcPtr -#define NewSndCallBackProc(x) ((SndCallBackProcPtr)(x)) -#define SndListHandle Handle -#endif """ initstuff = initstuff + """ -- cgit v0.12